switched over to haystack-2.0 as per pannal's pull request from ages ago