Comment 35 for bug 1025011

This seems to fix it.