Remove need for SKIP_HAYSTACK env variable, to help Travis