CJ-881

use existing autogenerated.colt when possible