diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs
index e395cd691..77eaae0b6 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs
@@ -108,7 +108,7 @@ namespace Orchard.Comments.Drivers {
 
             if (currentUser != null) part.Author = currentUser.UserName;
 
-            var moderateComments = workContext.CurrentSite.As<CommentSettingsPart>().Record.ModerateComments;
+            var moderateComments = workContext.CurrentSite.As<CommentSettingsPart>().ModerateComments;
             part.Status = moderateComments ? CommentStatus.Pending : CommentStatus.Approved;
 
             var commentedOn = _contentManager.Get<ICommonPart>(part.CommentedOn);
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentSettingsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentSettingsPartDriver.cs
index 4e06b09d5..98d67f325 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentSettingsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentSettingsPartDriver.cs
@@ -22,9 +22,9 @@ namespace Orchard.Comments.Drivers {
 
             return ContentShape("Parts_Comments_SiteSettings", () => {
                     if (updater != null) {
-                        updater.TryUpdateModel(part.Record, Prefix, null, null);
+                        updater.TryUpdateModel(part, Prefix, null, null);
                     }
-                    return shapeHelper.EditorTemplate(TemplateName: "Parts.Comments.SiteSettings", Model: part.Record, Prefix: Prefix); 
+                    return shapeHelper.EditorTemplate(TemplateName: "Parts.Comments.SiteSettings", Model: part, Prefix: Prefix); 
                 })
                 .OnGroup("comments");
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentSettingsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentSettingsPartHandler.cs
index 6c27cb257..f6305d03d 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentSettingsPartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentSettingsPartHandler.cs
@@ -1,17 +1,15 @@
 using JetBrains.Annotations;
 using Orchard.Comments.Models;
 using Orchard.ContentManagement;
-using Orchard.Data;
 using Orchard.ContentManagement.Handlers;
 using Orchard.Localization;
 
 namespace Orchard.Comments.Handlers {
     [UsedImplicitly]
     public class CommentSettingsPartHandler : ContentHandler {
-        public CommentSettingsPartHandler(IRepository<CommentSettingsPartRecord> repository) {
+        public CommentSettingsPartHandler() {
             T = NullLocalizer.Instance;
             Filters.Add(new ActivatingFilter<CommentSettingsPart>("Site"));
-            Filters.Add(StorageFilter.For(repository));
         }
 
         public Localizer T { get; set; }
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs
index 1a20211d1..d726fd581 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs
@@ -31,11 +31,6 @@ namespace Orchard.Comments {
                 .Column<int>("CommentsPartRecord_id")
                 );
 
-            SchemaBuilder.CreateTable("CommentSettingsPartRecord", table => table
-                .ContentPartRecord()
-                .Column<bool>("ModerateComments")
-               );
-
             SchemaBuilder.CreateTable("CommentsPartRecord", table => table
                 .ContentPartRecord()
                 .Column<bool>("CommentsShown")
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentSettingsPart.cs b/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentSettingsPart.cs
index 966608c2c..fbd3f35c6 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentSettingsPart.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentSettingsPart.cs
@@ -1,10 +1,10 @@
 using Orchard.ContentManagement;
 
 namespace Orchard.Comments.Models {
-    public class CommentSettingsPart : ContentPart<CommentSettingsPartRecord> {
+    public class CommentSettingsPart : ContentPart {
         public bool ModerateComments {
-            get { return Record.ModerateComments; }
-            set { Record.ModerateComments = value; }
+            get { return this.Retrieve(x => x.ModerateComments); }
+            set { this.Store(x => x.ModerateComments, value); }
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentSettingsPartRecord.cs b/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentSettingsPartRecord.cs
deleted file mode 100644
index 6233f15d5..000000000
--- a/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentSettingsPartRecord.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Orchard.ContentManagement.Records;
-
-namespace Orchard.Comments.Models {
-    public class CommentSettingsPartRecord : ContentPartRecord {
-        public virtual bool ModerateComments { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
index fe034a851..d00992c7f 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
@@ -98,7 +98,6 @@
     <Compile Include="ViewModels\CommentCountViewModel.cs" />
     <Compile Include="Models\CommentSettingsPart.cs" />
     <Compile Include="Handlers\CommentSettingsPartHandler.cs" />
-    <Compile Include="Models\CommentSettingsPartRecord.cs" />
     <Compile Include="Handlers\CommentsPartHandler.cs" />
     <Compile Include="Models\CommentsPart.cs" />
     <Compile Include="Permissions.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comments.SiteSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comments.SiteSettings.cshtml
index ca8181881..2407c6f9a 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comments.SiteSettings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comments.SiteSettings.cshtml
@@ -1,4 +1,4 @@
-@model Orchard.Comments.Models.CommentSettingsPartRecord
+@model Orchard.Comments.Models.CommentSettingsPart
 
 <fieldset>
     <legend>@T("Comments")</legend>
diff --git a/src/Orchard.Web/Modules/Upgrade/Controllers/InfosetController.cs b/src/Orchard.Web/Modules/Upgrade/Controllers/InfosetController.cs
index 8ce9fafaf..6d43b51bc 100644
--- a/src/Orchard.Web/Modules/Upgrade/Controllers/InfosetController.cs
+++ b/src/Orchard.Web/Modules/Upgrade/Controllers/InfosetController.cs
@@ -120,6 +120,14 @@ namespace Upgrade.Controllers {
 
             _upgradeService.ExecuteReader("DROP TABLE " + _upgradeService.GetPrefixedTableName("Orchard_OutputCache_CacheSettingsPartRecord"), null);
 
+            // CommentSettingsPartRecord
+            _upgradeService.ExecuteReader("SELECT * FROM " + _upgradeService.GetPrefixedTableName("Orchard_Comment_CommentSettingsPartRecord"),
+                (reader, connection) => {
+                    site.As<InfosetPart>().Store("CommentSettingsPart", "ModerateComments", (bool)reader["ModerateComments"]);
+                });
+
+            _upgradeService.ExecuteReader("DROP TABLE " + _upgradeService.GetPrefixedTableName("Orchard_Comment_CommentSettingsPartRecord"), null);
+
 
             _orchardServices.Notifier.Information(T("Site Settings migrated successfully"));