Revert "Update stuff from Josh"

This reverts commit 55b288316fb3d43f7eba2cf468b9a3ac3e53ac05.
Try again