Since this is an upstream bug I will close it and follow upstream instead. Feel free to reopen it in the future if the problem doesn't get fixed or reappears.