Revert "Fix Data stop while calling"

This reverts commit a8f2f1cad8b879e75cd126a5bdd20d369f198a68.