Revert r20162; changes behavior of sites that restrict editing, potentially