Revert "new setup"

This reverts commit 538c5078a2b897f846acdec7801a96c506c8132f.
what the hell...