Undo no-op

Change-Id: I3a651fb652e7963138d0e5f18678e7e2f985a454