fixup! Initial attempt at rerolling patch from PR-2610