This two changes should not have part of commit b5ee900e. The addSwitch is directly set in the setupCliProperties() function.