Fix comments from r211553