reconcile with kermit, et al.

Change-Id: I6504fe71774bc6a4f70a700bea51d750ed25f7ca