Yes, here's the commit that fixed the problem in the specific place I was looking:
6c2d5e1c8d1909fe5bc6da6c1dfd3a2fc867f6a1