For the record, the bug I am seeing is still present upstream as of 5b7449810ae6d652629c550d3974c8453836d229.