Revert "Reconcile some things."

This reverts commit 1b33f1f3bcdf968dedad700e3ea5d942fcc6f36c.