Revert "GCP-8113"

This reverts commit fc2e67ad2aecc9ee3c19cda5af8cabb58c22f43d.