Revert "Think I broke it all cleaning up, this should fix it"

This reverts commit 9bfad5ccb7b062a0be1b51d78462756557eaa416.
Revert "Revert "Think I broke it all cleaning up, this should fix it""

This reverts commit f7ea808f7f20ad0e21c27574942a171087e3b786.