Previous attempt still changed the user object and exception will be raised later. This now essentially reverts to the last working setup, to be addressed properly in TMSS-2876.