Reverted previous patch in User.moderator?