Fix build - disable haystack for now