MFC: r272491

  Reduce diffs against i386.