Revert "fix my own derp"

This reverts commit 4f5efeecd54bbc4375690dcc6fc02f6f8726d869.
Fix build
Revert "fix some merge derps, style to our code"

This reverts commit 75e16d61af6776cc4480f979cf9e057bc352bf0f.
Revert "Revert "fix some merge derps, style to our code""

This reverts commit 27e7440aa41300bb3e6263a9d0a6979b5faed703.
Revert "Revert "fix my own derp""

This reverts commit da64e22a2e7743ec51f8c415dc1b2f0be3cfa9c0.