Revert GCP-5954 and GCP-5957