MFC r271982 and r271990 to support CentOS 6 ports.