Revert "lil merge derp"

This reverts commit a5aa07a3a8b476dc49ec06e143b30c12e5193044.
Revert "Fixup merge errors"

This reverts commit 873b6e64bf42335d8736c98fe833b04868b8ef2d.