Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=710909

After a while of testing and checking alternatives, this seems to be the best available workaround...