(cherry picked from commit d83c86d42eda7063f7367057ad3afaf01e95c997)
This completes commit 3c510f028f https://bugzilla.gnome.org/show_bug.cgi?id=530351
3c510f028f