  #include "content/browser/renderer_host/input/one_shot_timeout_monitor.h"
  #include "content/browser/renderer_host/render_widget_host_impl.h"
  #include "content/browser/renderer_host/render_widget_host_view_base.h"
-@@ -149,7 +150,13 @@ void RenderWidgetTargeter::FindTargetAndDispatch(
-   // TODO(kenrb, wjmaclean): Asynchronous hit tests don't work properly with
-   // GuestViews, so rely on the synchronous result.
-   // See https://crbug.com/802378.
--  if (result.should_query_view && !target->IsRenderWidgetHostViewGuest()) {
-+  // TODO(darkdh): MUON - remove this hack when we fully migrate to OOPIF from
-+  // legacy guest webvie
-+  if (result.should_query_view &&
-+      (!target->IsRenderWidgetHostViewGuest() ||
-+       event.GetType() == blink::WebInputEvent::kMouseMove ||
-+       event.GetType() == blink::WebInputEvent::kMouseDown ||
-+       event.GetType() == blink::WebInputEvent::kMouseUp)) {
-     // TODO(kenrb, sadrul): When all event types support asynchronous hit
-     // testing, we should be able to have FindTargetSynchronously return the
-     // view and location to use for the renderer hit test query.
-@@ -161,6 +168,9 @@ void RenderWidgetTargeter::FindTargetAndDispatch(
+@@ -161,6 +162,9 @@ void RenderWidgetTargeter::FindTargetAndDispatch(
    } else {
      FoundTarget(root_view, target, *event_ptr, latency, result.target_location);
    }

 
   BrowserPluginManager::Get()->Send(
       new BrowserPluginHostMsg_Detach(browser_plugin_instance_id_));
@@ -596,8 +600,6 @@ blink::WebInputEventResult BrowserPlugin::HandleInputEvent(
 
   if (blink::WebInputEvent::IsGestureEventType(event.GetType())) {
     auto gesture_event = static_cast<const blink::WebGestureEvent&>(event);

           "blink::mojom::EngagementClient",
           "blink::mojom::InstallationService",
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index 973f835727b6d0050669a1bea76c84f53be85340..c23edc1ff21a341bc30e9e3bd95003b1b1f2e0bf 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -103,6 +103,7 @@ BrowserPlugin::BrowserPlugin(
     delegate_->SetElementInstanceID(browser_plugin_instance_id_);
 
   enable_surface_synchronization_ = features::IsSurfaceSynchronizationEnabled();
+  enable_surface_synchronization_ = false;
 }
 
 BrowserPlugin::~BrowserPlugin() {
@@ -214,7 +215,11 @@ void BrowserPlugin::Detach() {
 
   attached_ = false;
   guest_crashed_ = false;
