Add back support for pre-OAuth servers