Revert "Remove some old gnome2 cruft", I got a bit carried away ;)

This reverts commit 12727b8530d8ce84a2f6a89f5edc6251cbabb792.