This reverts commit 2b724ec00d. Reason for revert: cleanup Change-Id: I59140f34ac86ef1d25e707509bd52ddeb3ddf061
2b724ec00d