diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG
index 6fcdaf971ee7a07a3fccfd0ad943a56d5972fa05..fc50e0a7b9c1f7a92eb275efdeeed99339145e15 100644
--- a/actionwebservice/CHANGELOG
+++ b/actionwebservice/CHANGELOG
@@ -1,5 +1,7 @@
 *0.7.0* (Unreleased)
 
+* Remove ActiveRecordSoapMarshallable workaround, see #912 for details
+
 * Add scaffolding via ActionController::Base.web_service_scaffold for quick testing using a web browser
 
 * Generalize casting code to be used by both SOAP and XML-RPC (previously, it was only XML-RPC)
diff --git a/actionwebservice/lib/action_web_service/vendor/ws/marshaling/soap_marshaling.rb b/actionwebservice/lib/action_web_service/vendor/ws/marshaling/soap_marshaling.rb
index 287a64291b1aa22de148c93dc707dc1df6acff14..14c8d8401d93255d7be1d5da737a9087b58070f4 100644
--- a/actionwebservice/lib/action_web_service/vendor/ws/marshaling/soap_marshaling.rb
+++ b/actionwebservice/lib/action_web_service/vendor/ws/marshaling/soap_marshaling.rb
@@ -279,19 +279,5 @@ def soap2obj(obj_class, node, info, map)
         return false
       end
     end
-
-    module ActiveRecordSoapMarshallable
-      def allocate
-        obj = super
-        attrs = {}
-        self.columns.each{|c| attrs[c.name.to_s] = c.default}
-        obj.instance_variable_set('@attributes', attrs)
-        obj
-      end
-    end
-
-    if Object.const_defined?('ActiveRecord')
-      ActiveRecord::Base.extend(ActiveRecordSoapMarshallable)
-    end
   end
 end