No longer use deprecated generators.