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