Revert loganmc10's tree

This is causing huge slowdowns on the device. I'll manually re-add some changes.

This reverts commit 466375894eb1fc7620d4400a33deea24a0c9cdc0

Change-Id: I4ab495405757cc3e6ff9a34286e327768df227b0