Let's see if we can get away with not targeting 32-bit
cleanup