Revert "Fixed derp so it can compile"

Change-Id: I7bba6f305571a0652ac8a2be462d746fcf7487c7