This reverts commit aeb971c33a78308d793195127489b355bba4233a. https://bugzilla.gnome.org/show_bug.cgi?id=720885