Partial revert of the derp fix