Comment 4 for bug 998836

There seem to be a few stray tab characters in the patch but otherwise looks good to me (and since it fixes current intended behavior it can go in independent of the discussion in Bug #689291)