Reverting commit r205628 due to mips64 issues.