Part revert last commit.

Change-Id: I614d06c1797e0d591fd9d5080b05ef59b64372b0