Comment 2 for bug 1295581

The patch above appears to fix this issue, but it wasn't correctly tagged in the commit message to close this bug.

Closing as fix committed, please reopen if that is wrong and there are more patches required to fully resolve this.