Revert r113650 and reapply r113619 and r113649 with one modification: User::createNew...