Revert "Fix merge derp"

This reverts commit e6771434367376e5f69b71a874041d2612ebc9c6.