Revert to support GovCloud