Revert "sandstorm fix"

This reverts commit 3f840b25323d2d486a9065a33eb07eb6e0943b53.