If we are keeping this code in source control, might as well make it work. https://bugzilla.gnome.org/show_bug.cgi?id=638179