WIP oauth2-upgrade: oauth2 upgrade and REST fixes

Just remove the commented line.