Revert last commit.

Change-Id: I78abfcd6dd3bc8b9f1df4535fefdd68170d30675
Signed-off-by: Alex Fan <railor33@gmail.com>