Revert "Wait, what?"

The previous commit accidentally undid a bunch of changes because you
didn't sync before you made changes--By reverting that commit,
I am undoing all the undoing from the last commit. One really nice thing
about git is that the entire history of the project is always preserved,
so it's not possible to really break anything. You can always undo all
the way back.
This reverts commit 4aae601d753274d02f1c9cf8aebec8376d389d40, reversing
changes made to 27b8656dd49525915674846905fd65d97f8585c9.