Revert the LP64 part of the last commit, thinking error.