back to basics

Change-Id: I2391ac048f47eadeb8588d8d2e181336fbca0307