Comment 3 for bug 533872

I pushed a slightly different fix for this. Please pull rev 1172 and verify it does/does not work. My version attempts to avoid doing extra work, but as I said earlier I can't test this so who knows if I made a mistake. :-)