Revert "oauth2 fixes (#177)"