Revert "Fix derp"

This reverts commit 489b5f376983d1f71a5d826c8818009b9a288a6a.
Let's try this again

Change-Id: If36110c047aa6b8f9d19e82d4486ae5559662686
Fix up merge conflicts

Change-Id: Iec771cbd4ffdc504972cb2bfa19d0897d94f3e6c