Revert "due hangs fixed"

This reverts commit b206ee59a20e77d744ba67b9f08aed136737a0f9.