Revert "initial attempts to improve data handoff stability"

This reverts commit 161a06b98d0f17eb0df2e01e301b6932eab661b5.
use PhoneConstant value instead of string here for consistency