Speculatively revert commit 144124 (djg) in the hope that the 32 bit