Revert "Working with Ethan's latest commit...Hopefully"

This reverts commit 8d91bccf4e5dca28ea2c725738bfa1629c6483dc.