Reverting multiuser changes as they were moved to the branch of same
name