Revert "Fix merge derp"

This reverts commit 596b11e2565e10574e76d01be1085995d0474715.