Revert "yongming commit"

This reverts commit 43e33a0c5314031c54a479cc72efaa8b84bef95b.
Revert "Revert "yongming commit""

This reverts commit 82751647e5dbadcc74ad1c6a44535b0ef273c476.