diff --git a/osu.Android.props b/osu.Android.props
index 6dbc6cc377..17a6178641 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,8 +51,8 @@
-
-
+
+
diff --git a/osu.Game/Online/PollingComponent.cs b/osu.Game/Online/PollingComponent.cs
index d54b8ca75d..fcea650e2d 100644
--- a/osu.Game/Online/PollingComponent.cs
+++ b/osu.Game/Online/PollingComponent.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Online
///
/// A component which requires a constant polling process.
///
- public abstract class PollingComponent : CompositeDrawable // switch away from Component because InternalChildren are used in usages.
+ public abstract class PollingComponent : CompositeComponent
{
private double? lastTimePolled;
diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
index 2fd8445980..bb8ec4f6ff 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
@@ -27,13 +27,10 @@ namespace osu.Game.Online.Rooms
/// This differs from a regular download tracking composite as this accounts for the
/// databased beatmap set's checksum, to disallow from playing with an altered version of the beatmap.
///
- public class OnlinePlayBeatmapAvailabilityTracker : CompositeDrawable
+ public class OnlinePlayBeatmapAvailabilityTracker : CompositeComponent
{
public readonly IBindable SelectedItem = new Bindable();
- // Required to allow child components to update. Can potentially be replaced with a `CompositeComponent` class if or when we make one.
- protected override bool RequiresChildrenUpdate => true;
-
[Resolved]
private RealmAccess realm { get; set; } = null!;
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 28452c0a74..0613db891b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,8 +36,8 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
diff --git a/osu.iOS.props b/osu.iOS.props
index 463af1143f..bf1e4e350c 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -61,8 +61,8 @@
-
-
+
+
@@ -84,7 +84,7 @@
-
+