Revert "[0.0.9m] last bit of 64 bit fix"

This reverts commit 6c7810f00313bc48b0c626d227105656897c008f.