diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 3bfb432a9b1c3c460abbc47af55943f126d611b0..b399ab9bc4f5d0dd11e7c36b834b6fae06ab3c78 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -1022,14 +1022,7 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
 			// try as slurl first
 			if (!LLURLDispatcher::dispatch(url, "clicked", NULL, mTrusted))
 			{
- 				if (self->isOverrideClickTarget() && target == "_navigate")
-				{
-					navigateTo(url, HTTP_CONTENT_TEXT_HTML);
-				}
-				else
-				{
-					LLWeb::loadURL(url, target, uuid);
-				}
+				LLWeb::loadURL(url, target, uuid);
 			}
 
 			// CP: removing this code because we no longer support popups so this breaks the flow.
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index cc5332a7dbbec1fcb947246870bd14bf5327785f..0e50e8bdd0db9c286108fe0f76a244c281f600f1 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -854,11 +854,6 @@ void LLPanelProfileWeb::onOpen(const LLSD& key)
     resetData();
 
     mAvatarNameCacheConnection = LLAvatarNameCache::get(getAvatarId(), boost::bind(&LLPanelProfileWeb::onAvatarNameCache, this, _1, _2));
-
-    if (mWebBrowser->getMediaPlugin())
-    {
-        mWebBrowser->getMediaPlugin()->setOverrideClickTarget("_navigate");
-    }
 }
 
 BOOL LLPanelProfileWeb::postBuild()
@@ -1005,7 +1000,6 @@ void LLPanelProfileWeb::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent e
             LLStringUtil::format_map_t args;
             args["[TIME]"] = llformat("%.2f", mPerformanceTimer.getElapsedTimeF32());
             childSetValue("status_text", LLSD( getString("LoadTime", args)) );
-            resetLoading();
         }
         break;