[IC] revert shipping commits