Switch to using restclients and userservice built in override mechanism.