This reverts commit c6dcbed2e5327f0c11962bdbbcd02f1b5c570fea. Broke tests on arm and aarch64
496f9a7d8d