Revert "Merge branch 'settings' into security"

This reverts commit 47cf998e072a1980f9b704dee282cccdf2a678b1, reversing
changes made to 10a73a245b6b7d4e4e72aa2d608ab5e42444f9fd.