Revert "All of Jacob's commits"

This reverts commit 7aa2e413891354079ce7ed6ab4249249e73a3c1d.