Revert "Fix the hang ups"

This reverts commit 905de2c7eaae03ce2bd77a1ef18c1f8d6a34b02b.