Comment # 4 on bug 1210186 from Daniel Garcia

Okay, I've created a request backporting the patch that fixes the failing
tests.