Dropping support for handling this via the CLI means we don't need this package any more Change-Id: Ib13184018ca571f6d489491a04e7967de2542ac2