We had a regression since commit 60e1023f0 on Nov 27. Turns out we do need the ancient hack after all.
But no, we won't go back to the hack. It's a simple problem to fix right. And while we're at it, we'll fix the test harness to be more realistic so it would have caught this problem.
OGD5RAQK5BIZTFEYAKMVX33KNLYYJUIN2DW4KI2H5DHCVTZKU2TQC