CFY-642 reverted type hierarchy change