Comment 1 for bug 1168586

There is very clearly a code bug on cleanup here, trying to figure out if this is going to be quickly eliminated by fixtures, or if we should fix it in tree before then.