Removed workaround for tool control bug (seems to be fixed in Kepler)