back to goo we go

Change-Id: I862c3fc2cc2f4e9ddb33dc853d10555e43f5ad61