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