Revert "Changes in Oauth authorization model"

This reverts commit 383185b7c4b9c2204c072ba099236bd90867114a.