undo Fixes to User.php