Remove haystack, use a packaged version instead