Remove only the reverted diff entry rather than recompute the whole diff after revert (fixes #1745)

Remove only the reverted diff entry rather than recompute the whole diff after revert (fixes #1745) #614