Revert "Merging w/ Andrew's stuff"

This reverts commit 5d724976a5b765299ebdbba05ffa195f104e1cbe.