This reverts commit 5697b6b89b4b2a15c45bd47be940a17f4412ea11. https://bugzilla.gnome.org/show_bug.cgi?id=751003