Revert "140922"

This reverts commit b000af41951d0b6c1739d7f4e71687d8b8fef0bc.
140923

add Modeswitch