Revert "Fabric: Cleanup to use the new setup command"

This reverts commit 5c54bd43a7bde95f95c9da0acd7ac30c4a8e4481.