revert some herp

Change-Id: I76a9fcf20c54d1ea4fb51db1d0ff69e56b4db1c0