diff --git a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
index 082e28c35a..46c6cef456 100644
--- a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
+++ b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
@@ -110,10 +110,7 @@ namespace Umbraco.Web.Routing
                 Type type = null;
                 try
                 {
-                    //TODO: This isn't a good way to load the assembly, its already in the Domain so we should be getting the type
-                    // this loads the assembly into the wrong assembly load context!!
-
-                    var assembly = Assembly.LoadFrom(Umbraco.Core.IO.IOHelper.MapPath(Umbraco.Core.IO.SystemDirectories.Bin + "/" + assemblyName + ".dll"));
+                    var assembly = Assembly.Load(new AssemblyName(assemblyName));
                     type = assembly.GetType(ns + "." + typeName);
                 }
                 catch (Exception e)