Revert "rely on spindle from git for now"

This reverts commit 70653130c64fa4ee8cf8d7fa132d70f643f99055.