[kevinherron]

Yes, and that excellent commit would make an excellent PR all on its own. It’s entirely self-contained and should not be lumped in with some other change, so there is no reason it would be squashed in the first place.