remove workaround
Merge pull request #2773 from yugangw-msft/removeworkaround

remove workaround