Handle a 32-bit build

Import commit 0039811652dde905c32d6a4e47445e1303abb400 from williambr