Rvert partially pull request #78 and properly handle 64bits of data.