Support for pre-PCP 3.6.0.