Revert "Merge pull request #9589 from lodr/bug-828298-avoid-negative-offsets"

This reverts commit 101b189e9156d30cabe42b8d893246a12ef728ac.