Revert "Fix Data stall issue"

This reverts commit 6741d7bc16cfead51a393521eb50347b0290631d.