commando: Convert to distutils-r1
clint: Convert to distutils-r1