Hack added to fix bugzilla.gnome.org/727461.