partly revert

Change-Id: Ia65f6b0316d09f11c9605a020e1fe41f34d4be9e