Revert "STORM-259"

This reverts commit d5dee0ef5f8ad403d1eff05f569c8e9b1e44508c.