Revert "made it to work for haven"

This reverts commit cca1ec9722d6b15640bb0a9831547fda39b92c0a.