cherry-picked remove prn