diff --git a/webrtc/api/android/java/src/org/webrtc/EglRenderer.java b/webrtc/api/android/java/src/org/webrtc/EglRenderer.java
index b6dd649a52..70d7869269 100644
--- a/webrtc/api/android/java/src/org/webrtc/EglRenderer.java
+++ b/webrtc/api/android/java/src/org/webrtc/EglRenderer.java
@@ -101,8 +101,6 @@ public class EglRenderer implements VideoRenderer.Callbacks {
 
   // These variables are synchronized on |layoutLock|.
   private final Object layoutLock = new Object();
-  private int surfaceWidth;
-  private int surfaceHeight;
   private float layoutAspectRatio;
   // If true, mirrors the video stream horizontally.
   private boolean mirror;
@@ -458,17 +456,6 @@ public class EglRenderer implements VideoRenderer.Callbacks {
     completionCallback.run();
   }
 
-  /**
-   * Notify that the surface size has changed.
-   */
-  public void surfaceSizeChanged(int surfaceWidth, int surfaceHeight) {
-    logD("Surface size changed: " + surfaceWidth + "x" + surfaceHeight);
-    synchronized (layoutLock) {
-      this.surfaceWidth = surfaceWidth;
-      this.surfaceHeight = surfaceHeight;
-    }
-  }
-
   /**
    * Private helper function to post tasks safely.
    */
@@ -536,18 +523,6 @@ public class EglRenderer implements VideoRenderer.Callbacks {
     final int drawnFrameWidth;
     final int drawnFrameHeight;
     synchronized (layoutLock) {
-      int surfaceClearCount = 0;
-      while (eglBase.surfaceWidth() != surfaceWidth || eglBase.surfaceHeight() != surfaceHeight) {
-        ++surfaceClearCount;
-        if (surfaceClearCount > MAX_SURFACE_CLEAR_COUNT) {
-          logD("Failed to get surface of expected size - dropping frame.");
-          VideoRenderer.renderFrameDone(frame);
-          return;
-        }
-        logD("Surface size mismatch - clearing surface. Size: " + eglBase.surfaceWidth() + "x"
-            + eglBase.surfaceHeight() + " Expected: " + surfaceWidth + "x" + surfaceHeight);
-        clearSurfaceOnRenderThread();
-      }
       final float[] layoutMatrix;
       if (layoutAspectRatio > 0) {
         final float frameAspectRatio = frame.rotatedWidth() / (float) frame.rotatedHeight();
@@ -581,11 +556,11 @@ public class EglRenderer implements VideoRenderer.Callbacks {
 
       yuvUploader.uploadYuvData(
           yuvTextures, frame.width, frame.height, frame.yuvStrides, frame.yuvPlanes);
-      drawer.drawYuv(yuvTextures, drawMatrix, drawnFrameWidth, drawnFrameHeight, 0, 0, surfaceWidth,
-          surfaceHeight);
+      drawer.drawYuv(yuvTextures, drawMatrix, drawnFrameWidth, drawnFrameHeight, 0, 0,
+          eglBase.surfaceWidth(), eglBase.surfaceHeight());
     } else {
       drawer.drawOes(frame.textureId, drawMatrix, drawnFrameWidth, drawnFrameHeight, 0, 0,
-          surfaceWidth, surfaceHeight);
+          eglBase.surfaceWidth(), eglBase.surfaceHeight());
     }
 
     final long swapBuffersStartTimeNs = System.nanoTime();
diff --git a/webrtc/api/android/java/src/org/webrtc/SurfaceViewRenderer.java b/webrtc/api/android/java/src/org/webrtc/SurfaceViewRenderer.java
index d25d0610ff..5a7284afa1 100644
--- a/webrtc/api/android/java/src/org/webrtc/SurfaceViewRenderer.java
+++ b/webrtc/api/android/java/src/org/webrtc/SurfaceViewRenderer.java
@@ -252,7 +252,6 @@ public class SurfaceViewRenderer
   public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
     ThreadUtils.checkIsOnMainThread();
     logD("surfaceChanged: format: " + format + " size: " + width + "x" + height);
-    eglRenderer.surfaceSizeChanged(width, height);
   }
 
   private String getResourceName() {
diff --git a/webrtc/api/androidtests/src/org/webrtc/EglRendererTest.java b/webrtc/api/androidtests/src/org/webrtc/EglRendererTest.java
index 2ba0193675..2d8bc11bfa 100644
--- a/webrtc/api/androidtests/src/org/webrtc/EglRendererTest.java
+++ b/webrtc/api/androidtests/src/org/webrtc/EglRendererTest.java
@@ -97,7 +97,6 @@ public class EglRendererTest extends InstrumentationTestCase {
     surfaceTexture = new SurfaceTexture(oesTextureId);
     surfaceTexture.setDefaultBufferSize(1 /* width */, 1 /* height */);
     eglRenderer.createEglSurface(surfaceTexture);
-    eglRenderer.surfaceSizeChanged(1 /* width */, 1 /* height */);
   }
 
   @Override