CFY-642 put type hierarchy changes back in