partly revert

Change-Id: I56c8b51c83abe6da8896b5efdfaf457bcbf55234