Back to goo!

Change-Id: Iec7c7eec524c08e962d676468a4ae77c5f68dfe8