This reverts commit f72c3cf71fde622067f41f31a53978ba4c94469d. https://bugzilla.gnome.org/show_bug.cgi?id=707340