partial revert: derp