From 6c90d5825b395783e4f61416fa30cf530d90bce5 Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Mon, 14 Dec 2015 11:45:54 +0200
Subject: [PATCH] Story #109086524 - revert to allow merge, changes fixed on
 branch for story 109367694

---
 app/models/epp/domain.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 5468f9678..739c55bec 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -7,7 +7,6 @@ class Epp::Domain < Domain
 
   before_validation :manage_permissions
   def manage_permissions
-    return if is_admin # this bad hack for 109086524, refactor later
     return unless update_prohibited? || delete_prohibited?
     add_epp_error('2304', nil, nil, I18n.t(:object_status_prohibits_operation))
     false
@@ -507,9 +506,7 @@ class Epp::Domain < Domain
     frame = Nokogiri::XML(pending_json['frame'])
     statuses.delete(DomainStatus::PENDING_UPDATE)
     yield(self) if block_given? # need to skip statuses check here
-    save
 
-    PaperTrail.whodunnit = user
     return unless update(frame, user, false)
     clean_pendings!
     self.deliver_emails = true # turn on email delivery