87abbf9b20
Revert the hacks that where added in response to a bug caused by commit ba459f4d202 https://bugzilla.gnome.org/show_bug.cgi?id=705410