revert Switch to CheckBox (issues with pre-4.0)