Revert "fix for issue #1489"
Revert "fix for issue #1489"

This reverts commit 770841115b7c495e784a6f5939ed17bc0c5fd0f7.

Connum/w2ui,Connum/w2ui,Connum/w2ui,Connum/w2ui,Connum/w2ui,Connum/w2ui,Connum/w2ui