6.2 removed some commented-out stuff