diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerFactory.cs b/src/Microsoft.AspNet.Mvc.Core/DefaultControllerFactory.cs
index c90a5c2d0f..9664d45b14 100644
--- a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerFactory.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/DefaultControllerFactory.cs
@@ -1,7 +1,9 @@
 using System;
+using System.Linq;
 using System.Reflection;
 using Microsoft.AspNet.Abstractions;
 using Microsoft.AspNet.DependencyInjection;
+using Microsoft.AspNet.Mvc.ModelBinding;
 
 namespace Microsoft.AspNet.Mvc
 {
@@ -14,26 +16,20 @@ namespace Microsoft.AspNet.Mvc
             _serviceProvider = serviceProvider;
         }
 
-        public object CreateController(HttpContext context, ActionDescriptor actionDescriptor)
+        public object CreateController(ActionContext actionContext, ModelStateDictionary modelState)
         {
-            var typedAd = actionDescriptor as ReflectedActionDescriptor;
-
-            if (typedAd == null)
+            var actionDescriptor = actionContext.ActionDescriptor as ReflectedActionDescriptor;
+            if (actionDescriptor == null)
             {
                 return null;
             }
 
             try
             {
-                var controller = ActivatorUtilities.CreateInstance(_serviceProvider, typedAd.ControllerDescriptor.ControllerTypeInfo.AsType());
+                var controller = ActivatorUtilities.CreateInstance(_serviceProvider, actionDescriptor.ControllerDescriptor.ControllerTypeInfo.AsType());
 
                 // TODO: How do we feed the controller with context (need DI improvements)
-                var contextProperty = controller.GetType().GetRuntimeProperty("Context");
-
-                if (contextProperty != null)
-                {
-                    contextProperty.SetMethod.Invoke(controller, new object[] { context });
-                }
+                InitializeController(controller, actionContext, modelState);
 
                 return controller;
             }
@@ -47,5 +43,35 @@ namespace Microsoft.AspNet.Mvc
         public void ReleaseController(object controller)
         {
         }
+
+        private void InitializeController(object controller, ActionContext actionContext, ModelStateDictionary modelState)
+        {
+            var controllerType = controller.GetType();
+
+            foreach (var prop in controllerType.GetRuntimeProperties())
+            {
+                if (prop.Name == "Context" && prop.PropertyType == typeof(HttpContext))
+                {
+                    prop.SetValue(controller, actionContext.HttpContext);
+                }
+                else if (prop.Name == "ModelState" && prop.PropertyType == typeof(ModelStateDictionary))
+                {
+                    prop.SetValue(controller, modelState);
+                }
+            }
+
+            var method = controllerType.GetRuntimeMethods().FirstOrDefault(m => m.Name.Equals("Initialize", StringComparison.OrdinalIgnoreCase));
+
+            if (method == null)
+            {
+                return;
+            }
+
+            var args = method.GetParameters()
+                             .Select(p => _serviceProvider.GetService(p.ParameterType)).ToArray();
+
+            method.Invoke(controller, args);
+        }
+
     }
 }
diff --git a/src/Microsoft.AspNet.Mvc.Core/IControllerFactory.cs b/src/Microsoft.AspNet.Mvc.Core/IControllerFactory.cs
index adae9e35be..db4f820bcb 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IControllerFactory.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/IControllerFactory.cs
@@ -1,10 +1,11 @@
-using Microsoft.AspNet.Abstractions;
+
+using Microsoft.AspNet.Mvc.ModelBinding;
 
 namespace Microsoft.AspNet.Mvc
 {
     public interface IControllerFactory
     {
-        object CreateController(HttpContext context, ActionDescriptor actionDescriptor);
+        object CreateController(ActionContext actionContext, ModelStateDictionary modelState);
 
         void ReleaseController(object controller);
     }
diff --git a/src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs
index 0a97918845..693e524adf 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs
@@ -35,9 +35,10 @@ namespace Microsoft.AspNet.Mvc
 
         public async Task InvokeActionAsync()
         {
-            IActionResult actionResult = null;
+            IActionResult actionResult;
 
-            object controller = _controllerFactory.CreateController(_actionContext.HttpContext, _descriptor);
+            var modelState = new ModelStateDictionary();
+            object controller = _controllerFactory.CreateController(_actionContext, modelState);
 
             if (controller == null)
             {
@@ -45,9 +46,6 @@ namespace Microsoft.AspNet.Mvc
             }
             else
             {
-                var modelState = new ModelStateDictionary();
-                InitializeController(controller, modelState);
-
                 var method = _descriptor.MethodInfo;
 
                 if (method == null)
@@ -68,38 +66,6 @@ namespace Microsoft.AspNet.Mvc
             await actionResult.ExecuteResultAsync(_actionContext);
         }
 
-        private void InitializeController(object controller, ModelStateDictionary modelState)
-        {
-            var controllerType = controller.GetType();
-
-            foreach (var prop in controllerType.GetRuntimeProperties())
-            {
-                if (prop.Name == "Context")
-                {
-                    if (prop.PropertyType == typeof(HttpContext))
-                    {
-                        prop.SetValue(controller, _actionContext.HttpContext);
-                    }
-                }
-                else if (prop.Name == "ModelState" && prop.PropertyType == typeof(ModelStateDictionary))
-                {
-                    prop.SetValue(controller, modelState);
-                }
-            }
-
-            var method = controllerType.GetRuntimeMethods().FirstOrDefault(m => m.Name.Equals("Initialize", StringComparison.OrdinalIgnoreCase));
-
-            if (method == null)
-            {
-                return;
-            }
-
-            var args = method.GetParameters()
-                             .Select(p => _serviceProvider.GetService(p.ParameterType)).ToArray();
-
-            method.Invoke(controller, args);
-        }
-
         private async Task<IDictionary<string, object>> GetParameterValues(ModelStateDictionary modelState)
         {
             var actionBindingContext = await _bindingProvider.GetActionBindingContextAsync(_actionContext);