Revert "test"

This reverts commit bf7a9446b66a15f2b9aecee7c12bc90f4bedb00a.
revert some things

Change-Id: Iaac5d1d2c3f238da2b3334689fc550c5a5b67a10