GPII-752: Hacky update to PCP communication