Revert "Josh's Commit"

This reverts commit a9cea2cb83cc2aaaedbf13431bb4b5fd5fdba007.