Revert to 32-bit