reverted part of noregistration changes (not using plugin)