Reapply PR #4113 (removed via #4175)

Okay this should square the data at least. Commit history is now a little screwed, but we're back to where we started as of 96ba6da. Verification:

- [x] `git checkout upstream/pr/4175` (this PR)
- [x]  `git diff 96ba6da` (should return no diffs)

Turns out #4175 reverted #4113 since the revert it targeted was an unsigned re-apply of #4113 (?)