From 8f684ab102d583f777f74fb6e3ea6433dc057621 Mon Sep 17 00:00:00 2001
From: Robert Resch <robert@resch.dev>
Date: Mon, 6 Nov 2023 17:56:53 +0100
Subject: [PATCH] Revert binary_sensor part of #103210 (#103499)

---
 homeassistant/components/mqtt/binary_sensor.py | 10 ++--------
 tests/components/mqtt/test_init.py             |  9 ---------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/homeassistant/components/mqtt/binary_sensor.py b/homeassistant/components/mqtt/binary_sensor.py
index a89fb8a22fc57a..7ab2e9ebf90e6b 100644
--- a/homeassistant/components/mqtt/binary_sensor.py
+++ b/homeassistant/components/mqtt/binary_sensor.py
@@ -42,7 +42,6 @@
     MqttAvailability,
     MqttEntity,
     async_setup_entity_entry_helper,
-    validate_sensor_entity_category,
     write_state_on_attr_change,
 )
 from .models import MqttValueTemplate, ReceiveMessage
@@ -56,7 +55,7 @@
 DEFAULT_FORCE_UPDATE = False
 CONF_EXPIRE_AFTER = "expire_after"
 
-_PLATFORM_SCHEMA_BASE = MQTT_RO_SCHEMA.extend(
+PLATFORM_SCHEMA_MODERN = MQTT_RO_SCHEMA.extend(
     {
         vol.Optional(CONF_DEVICE_CLASS): vol.Any(DEVICE_CLASSES_SCHEMA, None),
         vol.Optional(CONF_EXPIRE_AFTER): cv.positive_int,
@@ -68,12 +67,7 @@
     }
 ).extend(MQTT_ENTITY_COMMON_SCHEMA.schema)
 
-DISCOVERY_SCHEMA = vol.All(
-    validate_sensor_entity_category,
-    _PLATFORM_SCHEMA_BASE.extend({}, extra=vol.REMOVE_EXTRA),
-)
-
-PLATFORM_SCHEMA_MODERN = vol.All(validate_sensor_entity_category, _PLATFORM_SCHEMA_BASE)
+DISCOVERY_SCHEMA = PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EXTRA)
 
 
 async def async_setup_entry(
diff --git a/tests/components/mqtt/test_init.py b/tests/components/mqtt/test_init.py
index 93d730948851dd..8112a289e62866 100644
--- a/tests/components/mqtt/test_init.py
+++ b/tests/components/mqtt/test_init.py
@@ -2163,15 +2163,6 @@ async def test_setup_manual_mqtt_with_invalid_config(
                 }
             }
         },
-        {
-            mqtt.DOMAIN: {
-                "binary_sensor": {
-                    "name": "test",
-                    "state_topic": "test-topic",
-                    "entity_category": "config",
-                }
-            }
-        },
     ],
 )
 @patch(