Instead of doing that at shutdown and delaying exit https://bugzilla.gnome.org/show_bug.cgi?id=649398