Pushed to wip-gnome as dadb7f7fb2..3856817ede.