Revert "Merge pull request #218 from aipocom/bugfix/user-add-rollback"

This reverts commit c02dae1f349b5932b8c12c754c077a32e9c3aa4b, reversing
changes made to 81a77a8ac8c47a3e01915fca60a23cc9629cbd8c.