diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 51544f52440..43a4f7d1c49 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -80,6 +80,9 @@
   ([#5490](https://github.com/google/ExoPlayer/issues/5490)).
 * HLS: Fix transition to STATE_ENDED when playing fragmented mp4 in chunkless
   preparation ([#5524](https://github.com/google/ExoPlayer/issues/5524)).
+* Revert workaround for video quality problems with Amlogic decoders, as this
+  may cause problems for some devices and/or non-interlaced content
+  ([#5003](https://github.com/google/ExoPlayer/issues/5003)).
 
 ### 2.9.5 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index f0d944e5a10..9c16fa63804 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -1105,10 +1105,6 @@ protected CodecMaxValues getCodecMaxValues(
       throws DecoderQueryException {
     int maxWidth = format.width;
     int maxHeight = format.height;
-    if (codecNeedsMaxVideoSizeResetWorkaround(codecInfo.name)) {
-      maxWidth = Math.max(maxWidth, 1920);
-      maxHeight = Math.max(maxHeight, 1089);
-    }
     int maxInputSize = getMaxInputSize(codecInfo, format);
     if (streamFormats.length == 1) {
       // The single entry in streamFormats must correspond to the format for which the codec is
@@ -1296,18 +1292,6 @@ private static boolean deviceNeedsNoPostProcessWorkaround() {
     return "NVIDIA".equals(Util.MANUFACTURER);
   }
 
-  /**
-   * Returns whether the codec is known to have problems with the configuration for interlaced
-   * content and needs minimum values for the maximum video size to force reset the configuration.
-   *
-   * <p>See https://github.com/google/ExoPlayer/issues/5003.
-   *
-   * @param name The name of the codec.
-   */
-  private static boolean codecNeedsMaxVideoSizeResetWorkaround(String name) {
-    return "OMX.amlogic.avc.decoder.awesome".equals(name) && Util.SDK_INT <= 25;
-  }
-
   /*
    * TODO:
    *