r173072 is causing some regressions on big endian hosts, I don't have time to debug it
so revert it for now.