diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs
index 44ed347d70c..e63954c3680 100644
--- a/src/libsyntax/fold.rs
+++ b/src/libsyntax/fold.rs
@@ -35,8 +35,15 @@ pub trait MoveMap<T> {
 }
 
 impl<T> MoveMap<T> for Vec<T> {
-    fn move_map(self, f: |T| -> T) -> Vec<T> {
-        self.move_iter().map(f).collect()
+    fn move_map(mut self, f: |T| -> T) -> Vec<T> {
+        use std::{mem, ptr};
+        for p in self.mut_iter() {
+            unsafe {
+                // FIXME(#5016) this shouldn't need to zero to be safe.
+                mem::move_val_init(p, f(ptr::read_and_zero(p)));
+            }
+        }
+        self
     }
 }
 
diff --git a/src/libsyntax/ptr.rs b/src/libsyntax/ptr.rs
index 92315a870f2..71cb2635280 100644
--- a/src/libsyntax/ptr.rs
+++ b/src/libsyntax/ptr.rs
@@ -31,8 +31,14 @@ impl<T: 'static> P<T> {
         f(*self.ptr)
     }
 
-    pub fn map(self, f: |T| -> T) -> P<T> {
-        self.and_then(|x| P(f(x)))
+    pub fn map(mut self, f: |T| -> T) -> P<T> {
+        use std::{mem, ptr};
+        unsafe {
+            let p = &mut *self.ptr;
+            // FIXME(#5016) this shouldn't need to zero to be safe.
+            mem::move_val_init(p, f(ptr::read_and_zero(p)));
+        }
+        self
     }
 }