un-malform dependencies

Change-Id: I7d36a62ccb509fcff0cf2129a6d4f85002c60e47