Revert "modify for fix build error"

This reverts commit ba560af8017a102072d0dca8a56711cc5b59eff8.
Revert "modify for fix build error"

This reverts commit d5508109898e621d09d2ed6f0c4fa3071ee84d13.
Revert "fix build error"

This reverts commit a712b633d53fd9ff31b7c7ff51420672d4c310d4.