Revert 6708d10ef71a7b1d713fbf93f8fd1f5d745e9b2a as it makes mips64 core dump