We will deal with this as part of moving to haystack (@jlmclaugh).