diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 6bed20a3b..b6aa0058d 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -511,6 +511,9 @@ void Layer::onPostComposition() {
         mFrameTracker.setDesiredPresentTime(desiredPresentTime);
 
         sp<Fence> frameReadyFence = mSurfaceTexture->getCurrentFence();
+        // XXX: Temporarily don't use the fence from the SurfaceTexture to
+        // work around a driver bug.
+        frameReadyFence.clear();
         if (frameReadyFence != NULL) {
             mFrameTracker.setFrameReadyFence(frameReadyFence);
         } else {
@@ -521,6 +524,9 @@ void Layer::onPostComposition() {
 
         const HWComposer& hwc = mFlinger->getHwComposer();
         sp<Fence> presentFence = hwc.getDisplayFence(HWC_DISPLAY_PRIMARY);
+        // XXX: Temporarily don't use the present fence from HWC to work
+        // around a driver bug.
+        presentFence.clear();
         if (presentFence != NULL) {
             mFrameTracker.setActualPresentFence(presentFence);
         } else {