Comment 1 for bug 872836

Do we wish to fix this for 2.0.2, I would surges to push this to 2.1.