Another attempt to get 32-bit binary support working.