Revert other changes and pin Haystack version

Sorry about the cruft, but then I'm just talking to myself anyways.