783efeb544
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.