Revert "Merge branch 'fix-user-revert-return-structured-error' into 'master'"

This reverts commit 7f019337, reversing changes made to 82dcc6a7.