Started as a PR in https://github.com/tendermint/tendermint/pull/2876 that got subsumed by #2923, which also addressed a few other related issues. Never had it's own issue.