diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs
index 629fa5ed30c..cc347ced7a8 100644
--- a/src/components/script/dom/element.rs
+++ b/src/components/script/dom/element.rs
@@ -290,22 +290,22 @@ impl Element {
         match idx {
             None => (),
             Some(idx) => {
-                let removed = self.attrs.remove(idx);
-                let removed_raw_value = removed.get().Value();
-
                 if namespace == namespace::Null {
-                    self.after_remove_attr(abstract_self, local_name, removed_raw_value);
+                    let removed_raw_value = self.attrs[idx].get().Value();
+                    self.before_remove_attr(abstract_self, local_name, removed_raw_value);
                 }
+
+                self.attrs.remove(idx);
             }
         };
 
         Ok(())
     }
 
-    fn after_remove_attr(&mut self,
-                         abstract_self: &JS<Element>,
-                         local_name: DOMString,
-                         old_value: DOMString) {
+    fn before_remove_attr(&mut self,
+                          abstract_self: &JS<Element>,
+                          local_name: DOMString,
+                          old_value: DOMString) {
         match local_name.as_slice() {
             "style" => {
                 self.style_attribute = None
@@ -328,11 +328,11 @@ impl Element {
         match abstract_self.get().node.type_id {
             ElementNodeTypeId(HTMLImageElementTypeId) => {
                 let mut elem: JS<HTMLImageElement> = HTMLImageElementCast::to(abstract_self);
-                elem.get_mut().AfterRemoveAttr(local_name.clone());
+                elem.get_mut().BeforeRemoveAttr(local_name.clone());
             }
             ElementNodeTypeId(HTMLIframeElementTypeId) => {
                 let mut elem: JS<HTMLIFrameElement> = HTMLIFrameElementCast::to(abstract_self);
-                elem.get_mut().AfterRemoveAttr(local_name.clone());
+                elem.get_mut().BeforeRemoveAttr(local_name.clone());
             }
             _ => ()
         }
diff --git a/src/components/script/dom/htmliframeelement.rs b/src/components/script/dom/htmliframeelement.rs
index 92e0c63dfc7..4f25371772b 100644
--- a/src/components/script/dom/htmliframeelement.rs
+++ b/src/components/script/dom/htmliframeelement.rs
@@ -140,7 +140,7 @@ impl HTMLIFrameElement {
         }
     }
 
-    pub fn AfterRemoveAttr(&mut self, name: DOMString) {
+    pub fn BeforeRemoveAttr(&mut self, name: DOMString) {
         if "sandbox" == name {
             self.sandbox = None;
         }
diff --git a/src/components/script/dom/htmlimageelement.rs b/src/components/script/dom/htmlimageelement.rs
index 4f18597449c..1b336282b3d 100644
--- a/src/components/script/dom/htmlimageelement.rs
+++ b/src/components/script/dom/htmlimageelement.rs
@@ -96,7 +96,7 @@ impl HTMLImageElement {
         }
     }
 
-    pub fn AfterRemoveAttr(&mut self, name: DOMString) {
+    pub fn BeforeRemoveAttr(&mut self, name: DOMString) {
         if "src" == name {
             self.update_image(None, None);
         }