Revert "oauth by default using default keys (bug 1106198)"

This reverts commit a1ab5305ca78eadbaee115a0cc9dc821266c49ca.