Revert try to fix OAuth plugin problem;