This is just a stop-gap; seemed better than a real revert. The issue is from commit 8d3fe232e (PR #198666).
8d3fe232e