Import newer version of the m-c patch.