Comment 7 for bug 636930

This appears to be shallow. It's in a code path not currently covered by our test suite, so I think a refactoring probably broke it. I'll fix and also try to make sure it has some test coverage.