Fix or revertV2

Change-Id: I98c118e47891a5d72e03cbac8085ed88457d9ffc