prepare for revert

Change-Id: Icb4f80147d1d7ef44f5ad685dd74a58a7ae0613f