Revert prior commit regarding overflow fixup. Something way wrong.