This reverts commit cc1b4eaf9ebe4568f9c2c64338cef1b2edbdca3f. See https://bugzilla.gnome.org/show_bug.cgi?id=734617