Merge pull request #1749 from ehuss/diff-only-once

Merge pull request #1749 from ehuss/diff-only-once #4745