Backout d25cccda055f for testing x64 changes better

--HG--
extra : amend_source : def3ff864fad1c688a3eeef54742c224929f9aa0