returning to this project after all

Change-Id: Ib60719e2b458c756be8f44721024fb3b01baf6b6