Merge "Make PPFrame::RECOVER_COMMENTS actually work"