This reverts commit 3f6759061d. Proper fix is in https://bugzilla.gnome.org/show_bug.cgi?id=609811
3f6759061d