Make it more obvious, and also make it non-optional. https://bugzilla.gnome.org/show_bug.cgi?id=712274