This reverts commit 1692651546. Accidentally committed a bunch of not finished changes...
1692651546
--HG-- branch : gnome3