Maybe we don't need to remove it after bug 979191 is fixed, the change actually makes sense. What do you think? If you think the same, just remove the last line of the comment