Comment 2 for bug 1066136

The linked branch fixes the problem. It passes the test attached to the bug report.