Revert "upstream(fixed switches)"

This reverts commit 3e3c5fc742034ceaa44e4ba1eae8094741dc2521.