Merge "Remove mips workaround."