This needs to be coordinated with gnome-control-center.
g-c-c patch: gnome-control-center!454 (merged)