Issue #2800715 by dcam, shashikant_chauhan, mikeryan, quietone, alexpott: Reset highwater mark *before* rolling back
mentioned in commit a94e3c35
mentioned in commit 18059771