Revert "Fix Data stop while calling"

This reverts commit e4c0de0e77d9be772c23513dbad3bc2cb4627d5a.