Reverting back to use official API server