kittykat, come to daddy

Change-Id: I1676e4ca2816c337ecc55c7d03c7380bc7e76bf4