Revert "Merge branch 'oauth-extra-scopes' into 'develop'" See merge request !1032
mentioned in commit c1a0e239