Comment 5 for bug 64430

Thanks to an extensive two day debug session with Matt, we've reduced this to a single commit, and actually to a single portion of that commit.

Patch is in, and hopefully this will make it into edgy release.