Applying the two patches on the upstream bug seems to fix the issue here, at least the test case works now. Filing here to not loose track, have poked a3li to bump in IRC.
Patches are applied in 1.8.7_p249-r1. I'll ask for stabilization in a few days. Thanks.