Revert "Fix merge derp"

This reverts commit 3d781743f134569d5a5f6a28fc6e3871b6c24fd4.