The first of manu derps of the kk era

Change-Id: I4fc564caa0e60efb9afdcd224c947f2464822afc