diff --git a/app/models/contact.rb b/app/models/contact.rb
index 1143c0e34..11c8bdc8a 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -21,8 +21,6 @@ class Contact < ApplicationRecord
   alias_attribute :kind, :ident_type
   alias_attribute :copy_from_id, :original_id # Old attribute name; for PaperTrail
 
-  accepts_nested_attributes_for :legal_documents
-
   scope :email_verification_failed, lambda {
     joins('LEFT JOIN email_address_verifications emv ON contacts.email = emv.email')
       .where('success = false and verified_at IS NOT NULL')
diff --git a/app/models/domain.rb b/app/models/domain.rb
index c60d11f3f..b706744bd 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -55,7 +55,6 @@ class Domain < ApplicationRecord
   accepts_nested_attributes_for :dnskeys, allow_destroy: true
 
   has_many :legal_documents, as: :documentable
-  accepts_nested_attributes_for :legal_documents, reject_if: proc { |attrs| attrs[:body].blank? }
   has_many :registrant_verifications, dependent: :destroy
 
   after_initialize do
diff --git a/app/models/legal_document.rb b/app/models/legal_document.rb
index 446087124..0328e4b03 100644
--- a/app/models/legal_document.rb
+++ b/app/models/legal_document.rb
@@ -1,5 +1,4 @@
 class LegalDocument < ApplicationRecord
-  cattr_accessor :explicitly_write_file
   include EppErrors
   MIN_BODY_SIZE = (1.37 * 3.kilobytes).ceil
 
@@ -44,7 +43,7 @@ class LegalDocument < ApplicationRecord
         break unless File.file?(path)
     end
 
-    File.open(path, 'wb') { |f| f.write(binary) } if !Rails.env.test? || self.class.explicitly_write_file
+    File.open(path, 'wb') { |f| f.write(binary) } if !Rails.env.test?
     self.path = path
     self.checksum = digest
   end