Revert "Revert "Fixed derp so it can compile""

This reverts commit 0dca22e4e7d74fce8c089ae631543174afb02876.