revert previous commit

Change-Id: I2b3c6f7c1510317974a2299719a33ed3bb29d9a6