Comment 5 for bug 1430645

Yes, backporting isn't that nice, but in this case I would prefer to get this fix merged more sooner than later.

And the fix itself is only a few lines, should be ok to merge it afterwards in Thiagos patch?

I attached a functional test that basically does the same as your shell script - fails on master, passes with your fix.