Broken build caused by new oauth2 commits fixed.