Revert "comment out what we dont have and fix build"

Change-Id: If2904a1c46e5ac9e429259483d108b518bd59c09