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

This reverts commit 55e8e112c0fef75a0530e654e3b453601bda5459.