Revert previous commit

Change-Id: I59986497005664d8e07d6826cfe158252824015c