Revert "[setup] Fix install problems"

This reverts commit 3ac58bda8fe113963ee694b6e9c1528f9b92a5df.
[setup] Actually fix install problems

I have the memory of a squirrel.