(Split out of a larger commit by Colin Walters <walters@verbum.org>) https://bugzilla.gnome.org/show_bug.cgi?id=648651