Revert "Fix 32bit bug"

This reverts commit f20375cf5fa38c341ab0ffc85272826c4c5c6430.