Revert the treedrawer stuff again