Oops, deleted slightly to much code when enabling enabling 64-bit ABI.

committed,
Andrew