diff --git a/app/models/content.rb b/app/models/content.rb
index <HASH>..<HASH> 100644
--- a/app/models/content.rb
+++ b/app/models/content.rb
@@ -46,6 +46,18 @@ class Content < ActiveRecord::Base
     end
   end
 
+  # Set the text filter for this object.
+  # NOTE: Due to how Rails injects association methods, this cannot be put in ContentBase
+  # TODO: Allowing assignment of a string here is not very clean.
+  def text_filter= filter
+    filter_object = filter.to_text_filter
+    if filter_object
+      self.text_filter_id = filter_object.id
+    else
+      self.text_filter_id = filter.to_i
+    end
+  end
+
   def shorten_url
     return unless self.published
 
diff --git a/app/models/content_base.rb b/app/models/content_base.rb
index <HASH>..<HASH> 100644
--- a/app/models/content_base.rb
+++ b/app/models/content_base.rb
@@ -10,16 +10,6 @@ module ContentBase
   attr_accessor :just_changed_published_status
   alias_method :just_changed_published_status?, :just_changed_published_status
 
-  # Set the text filter for this object.
-  def text_filter= filter
-    filter_object = filter.to_text_filter
-    if filter_object
-      self.text_filter_id = filter_object.id
-    else
-      self.text_filter_id = filter.to_i
-    end
-  end
-
   def really_send_notifications
     interested_users.each do |value|
       send_notification_to_user(value)
Move #text_filter= override to where it will be picked up