Revert "Changes to make things work with user-api-client and, subsequently, user-api"

This reverts commit 156b73ddf21661091964bba2c09acaa82ac18ee0.