I don't think the public keys are even used in these cases. This seems to be a leftover from the legacy cryptosystems. I recommend checking this first before making the change.