Revert "Chris updated stuff"

This reverts commit f0726f7a7feb0c03a96b953ce2551be2f188f387.