De-funk

Change-Id: Icd44e92f73844f490357f50abcefe0f67ae526c2