Comment # 66 on bug 942896 from Ancor Gonzalez Sosa

The patch breaks automated tests. I will take a look and (hopefully) fix the
problem.