Merge "Switch back user to the initial user in teardown()."