This reverts commit 38a0d5af7e. Test: make checkbuild Test: ./run_tests.py Test: ./run_tests.py --bitness 64
38a0d5af7e