Revert some changes committing while attempting a fix for multiuser