Revert "New Setup"

This reverts commit 065e7d577313052a08e1a8484260ee0c2a1a9116.