diff --git a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
index d920851bd..61b63b07d 100644
--- a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
@@ -16,7 +16,6 @@ using Orchard.Data;
 using Orchard.DisplayManagement;
 using Orchard.Localization;
 using Orchard.Logging;
-using Orchard.Mvc;
 using Orchard.Mvc.Extensions;
 using Orchard.Mvc.Html;
 using Orchard.UI.Navigation;
@@ -110,7 +109,7 @@ namespace Orchard.Core.Contents.Controllers {
         }
 
         [HttpPost, ActionName("List")]
-        [FormValueRequired("submit.Filter")]
+        [Mvc.FormValueRequired("submit.Filter")]
         public ActionResult ListFilterPOST(ContentOptions options) {
             var routeValues = ControllerContext.RouteData.Values;
             if (options != null) {
@@ -127,7 +126,7 @@ namespace Orchard.Core.Contents.Controllers {
         }
 
         [HttpPost, ActionName("List")]
-        [FormValueRequired("submit.BulkEdit")]
+        [Mvc.FormValueRequired("submit.BulkEdit")]
         public ActionResult ListPOST(ContentOptions options, IEnumerable<int> itemIds, string returnUrl) {
             if (itemIds != null) {
                 var checkedContentItems = _contentManager.GetMany<ContentItem>(itemIds, VersionOptions.Latest, QueryHints.Empty);
@@ -204,7 +203,7 @@ namespace Orchard.Core.Contents.Controllers {
         }
 
         [HttpPost, ActionName("Create")]
-        [FormValueRequired("submit.Save")]
+        [Mvc.FormValueRequired("submit.Save")]
         public ActionResult CreatePOST(string id, string returnUrl) {
             return CreatePOST(id, returnUrl, contentItem => {
                 if (!contentItem.Has<IPublishingControlAspect>() && !contentItem.TypeDefinition.Settings.GetModel<ContentTypeSettings>().Draftable)
@@ -213,7 +212,7 @@ namespace Orchard.Core.Contents.Controllers {
         }
 
         [HttpPost, ActionName("Create")]
-        [FormValueRequired("submit.Publish")]
+        [Mvc.FormValueRequired("submit.Publish")]
         public ActionResult CreateAndPublishPOST(string id, string returnUrl) {
 
             // pass a dummy content to the authorization check to check for "own" variations
@@ -267,7 +266,7 @@ namespace Orchard.Core.Contents.Controllers {
         }
 
         [HttpPost, ActionName("Edit")]
-        [FormValueRequired("submit.Save")]
+        [Mvc.FormValueRequired("submit.Save")]
         public ActionResult EditPOST(int id, string returnUrl) {
             return EditPOST(id, returnUrl, contentItem => {
                 if (!contentItem.Has<IPublishingControlAspect>() && !contentItem.TypeDefinition.Settings.GetModel<ContentTypeSettings>().Draftable)
@@ -276,7 +275,7 @@ namespace Orchard.Core.Contents.Controllers {
         }
 
         [HttpPost, ActionName("Edit")]
-        [FormValueRequired("submit.Publish")]
+        [Mvc.FormValueRequired("submit.Publish")]
         public ActionResult EditAndPublishPOST(int id, string returnUrl) {
             var content = _contentManager.Get(id, VersionOptions.Latest);
 
@@ -410,4 +409,18 @@ namespace Orchard.Core.Contents.Controllers {
             ModelState.AddModelError(key, errorMessage.ToString());
         }
     }
+
+    [Obsolete("Use Orchard.Mvc.FormValueRequiredAttribute instead.")]
+    public class FormValueRequiredAttribute : ActionMethodSelectorAttribute {
+        private readonly string _submitButtonName;
+
+        public FormValueRequiredAttribute(string submitButtonName) {
+            _submitButtonName = submitButtonName;
+        }
+
+        public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo) {
+            var value = controllerContext.HttpContext.Request.Form[_submitButtonName];
+            return !string.IsNullOrEmpty(value);
+        }
+    }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Alias/Controllers/AdminController.cs
index fb0920d3a..79669da3f 100644
--- a/src/Orchard.Web/Modules/Orchard.Alias/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Alias/Controllers/AdminController.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web.Mvc;
-using System.Web.Routing;
 using Orchard.Alias.Implementation.Holder;
 using Orchard.Alias.ViewModels;
-using Orchard.Core.Contents.Controllers;
 using Orchard.Environment.Extensions;
 using Orchard.Localization;
 using Orchard.Logging;
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs
index 9c06e2c70..6d044361c 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs
@@ -9,7 +9,6 @@ using Orchard.ContentTypes.Extensions;
 using Orchard.ContentTypes.Services;
 using Orchard.ContentTypes.Settings;
 using Orchard.ContentTypes.ViewModels;
-using Orchard.Core.Contents.Controllers;
 using Orchard.Core.Contents.Settings;
 using Orchard.Environment.Configuration;
 using Orchard.Localization;
diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs
index e2865900c..36d23dde0 100644
--- a/src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Lists/Controllers/AdminController.cs
@@ -8,7 +8,6 @@ using Orchard.ContentManagement.MetaData.Models;
 using Orchard.Core.Common.Models;
 using Orchard.Core.Containers.Models;
 using Orchard.Core.Contents;
-using Orchard.Core.Contents.Controllers;
 using Orchard.Core.Contents.Settings;
 using Orchard.DisplayManagement;
 using Orchard.Lists.ViewModels;
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs
index 35261896d..d477a7d17 100644
--- a/src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs
@@ -3,7 +3,6 @@ using System.Linq;
 using System.Web.Mvc;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Aspects;
-using Orchard.Core.Contents.Controllers;
 using Orchard.Core.Contents.Settings;
 using Orchard.DisplayManagement;
 using Orchard.Localization.Models;
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs
index 33abae042..331260ad3 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Web.Mvc;
 using Orchard.ContentManagement;
-using Orchard.Core.Contents.Controllers;
 using Orchard.Localization;
 using Orchard.Logging;
 using Orchard.Media.Models;
diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/FolderController.cs b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/FolderController.cs
index d257cf167..e7b33cd33 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/FolderController.cs
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/FolderController.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.Linq;
 using System.Web.Mvc;
-using Orchard.Core.Contents.Controllers;
 using Orchard.Localization;
 using Orchard.Logging;
 using Orchard.MediaLibrary.Models;
diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Controllers/AdminController.cs
index e49a20e17..5a9607cb2 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Controllers/AdminController.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Web.Mvc;
 using System.Web.Routing;
 using Orchard.ContentManagement;
-using Orchard.Core.Contents.Controllers;
 using Orchard.DisplayManagement;
 using Orchard.Forms.Services;
 using Orchard.Localization;
diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Projections/Controllers/AdminController.cs
index ea467ea8b..be8a75ae2 100644
--- a/src/Orchard.Web/Modules/Orchard.Projections/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Projections/Controllers/AdminController.cs
@@ -12,7 +12,6 @@ using Orchard.Projections.Models;
 using Orchard.Projections.Services;
 using Orchard.Projections.ViewModels;
 using Orchard.ContentManagement;
-using Orchard.Core.Contents.Controllers;
 using Orchard.DisplayManagement;
 using Orchard.Localization;
 using Orchard.UI.Notify;
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Roles/Controllers/AdminController.cs
index 04df3ac9e..f78ae0f56 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Controllers/AdminController.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web.Mvc;
-using Orchard.Core.Contents.Controllers;
 using Orchard.Localization;
 using Orchard.Logging;
 using Orchard.Mvc;
@@ -12,7 +11,6 @@ using Orchard.Roles.Services;
 using Orchard.Roles.ViewModels;
 using Orchard.Security;
 using Orchard.UI.Notify;
-using Orchard.Utility.Extensions;
 
 namespace Orchard.Roles.Controllers {
     [ValidateInput(false)]
diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Rules/Controllers/AdminController.cs
index 426a6e888..562f70c0c 100644
--- a/src/Orchard.Web/Modules/Orchard.Rules/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Rules/Controllers/AdminController.cs
@@ -8,7 +8,6 @@ using Orchard.Rules.Models;
 using Orchard.Rules.Services;
 using Orchard.Rules.ViewModels;
 using Orchard.ContentManagement;
-using Orchard.Core.Contents.Controllers;
 using Orchard.Data;
 using Orchard.DisplayManagement;
 using Orchard.Localization;
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
index ac2c8969a..a3d103e8e 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
@@ -4,7 +4,6 @@ using System.Text.RegularExpressions;
 using System.Web.Mvc;
 using System.Web.Routing;
 using Orchard.ContentManagement;
-using Orchard.Core.Contents.Controllers;
 using Orchard.Core.Settings.Models;
 using Orchard.DisplayManagement;
 using Orchard.Localization;
diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Warmup/Controllers/AdminController.cs
index 768ebb6af..19618da25 100644
--- a/src/Orchard.Web/Modules/Orchard.Warmup/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Warmup/Controllers/AdminController.cs
@@ -3,7 +3,6 @@ using System.IO;
 using System.Linq;
 using System.Web.Mvc;
 using Orchard.ContentManagement;
-using Orchard.Core.Contents.Controllers;
 using Orchard.Localization;
 using Orchard.Mvc;
 using Orchard.Security;
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
index 85df52f8b..57a3389e8 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
@@ -4,7 +4,6 @@ using System.Globalization;
 using System.Web.Mvc;
 using System.Linq;
 using Orchard.ContentManagement;
-using Orchard.Core.Contents.Controllers;
 using Orchard.DisplayManagement;
 using Orchard.Environment.Extensions.Models;
 using Orchard.FileSystems.VirtualPath;
diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Workflows/Controllers/AdminController.cs
index 4852b7af2..1fe8ac2e6 100644
--- a/src/Orchard.Web/Modules/Orchard.Workflows/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Workflows/Controllers/AdminController.cs
@@ -4,7 +4,6 @@ using System.Web.Mvc;
 using System.Web.Routing;
 using Newtonsoft.Json.Linq;
 using Orchard.ContentManagement;
-using Orchard.Core.Contents.Controllers;
 using Orchard.Data;
 using Orchard.DisplayManagement;
 using Orchard.Forms.Services;