I wouldn't remove that to be honest. I think it should work if we asked people to not use this feature unless they really need it (and sometimes it is usefull)