Revert GCP-7370 Changes in IBPCommons