Revert "crashes when threshold run"

This reverts commit b8dfb6e03aa6915a3030d2e5f47455bef46de047.