Revert "Fix derp"

This reverts commit 182d64edcb72190a027a487d86b603672d114503

Change-Id: I2320b1ddbb550e87dc63d86910973e1dde413e45