Revert "re-apply patch to services module for oauth2_server integration"

This reverts commit 034fdca4fb0bbbace1becc7f709ef1443c1c2b3d.