Merge "Remove mips workarounds."