Fix p/g mixup that I just put back.