re-apply the fix for GCP-7958