Revert r286144 leaving the original fix to the buffer overflow.

Some developers consider the new code unnecessarily obfuscated.
There was also a benign off-by-one.

Discussed with: bde, vangyzen, jmallett