Reverted a mistaken change which breaks 64 bit compilation