... introduced by 1f0b6922d3c continuation of 88fa50c2f2bbc472fe7169eac8f2a1b2312ef03b
Seems like the right thing to do.