See pull #1033 , we can't just remove it without breaking stuff, unless we have a good solution for the problem cases.