revet all

Change-Id: I0c13a1ea0953cefd7dfebebd1faa526df06a4dae