Fixed revert issues again and again...

Change-Id: I285dcd686a65c2df973c2ba5794929c7d673188b