diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
index 35994a767645..54638bf55664 100644
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -572,14 +572,6 @@ public:
return;
}
- // This is a workaround and it will be fix in bug 1264230.
- nsCOMPtr loadInfo = channel->GetLoadInfo();
- if (loadInfo) {
- NeckoOriginAttributes originAttrs;
- NS_GetOriginAttributes(channel, originAttrs);
- loadInfo->SetOriginAttributes(originAttrs);
- }
-
// The listener holds a strong reference to us. This creates a
// reference cycle, once we've set mChannel, which is manually broken
// in the listener's OnStartRequest method after it is finished with
diff --git a/image/imgLoader.cpp b/image/imgLoader.cpp
index 8a184899d08f..3d1530fa47e4 100644
--- a/image/imgLoader.cpp
+++ b/image/imgLoader.cpp
@@ -851,21 +851,6 @@ NewImageChannel(nsIChannel** aResult,
}
(*aResult)->SetLoadGroup(loadGroup);
- // This is a workaround and a real fix in bug 1264231.
- if (callbacks) {
- nsCOMPtr loadContext = do_GetInterface(callbacks);
- if (loadContext) {
- nsCOMPtr loadInfo;
- rv = (*aResult)->GetLoadInfo(getter_AddRefs(loadInfo));
- NS_ENSURE_SUCCESS(rv, rv);
- DocShellOriginAttributes originAttrs;
- loadContext->GetOriginAttributes(originAttrs);
- NeckoOriginAttributes neckoOriginAttrs;
- neckoOriginAttrs.InheritFromDocShellToNecko(originAttrs);
- loadInfo->SetOriginAttributes(neckoOriginAttrs);
- }
- }
-
return NS_OK;
}