Removing SUPPORTS_COVERED_SWITCH_DEFAULT_FLAG