First step in yet another approach...

Change-Id: Ie64a759e47f11c79f8a14c58cf185435ba12d48d