Revert "Merged Tyler's work into master"

This reverts commit 2aa4973f648f10233e6318aa87ad7ba825f07fab.