Revert "bring in sync with ele"

This reverts commit 63733c379ce4866024007312a131607df72d8bf7.