pending further discussion in https://bugzilla.gnome.org/show_bug.cgi?id=639762 This reverts commit 7790a07c08.
7790a07c08