Revert "Add global override option to the settings page.  Only have one 'submit' button."

This reverts commit 358b65991a9d873329f9e1e32d3270a0ddabdf55.