Now that I look at the diff again, although it still looks like a bug, it seems the bug was already there. This PR did not introduce it.