Revert r345244 for now.

The code which advances the block number is simplistic and is not
correct when the starting offset is non-zero. Revert the change until
this is fixed.