switch to oauth-dropins, part 2