diff --git a/src/libstd/intrinsics.rs b/src/libstd/intrinsics.rs
index 175c7fe57b3..7f02ab28342 100644
--- a/src/libstd/intrinsics.rs
+++ b/src/libstd/intrinsics.rs
@@ -394,9 +394,7 @@ extern "rust-intrinsic" {
 
     pub fn roundf32(x: f32) -> f32;
     pub fn roundf64(x: f64) -> f64;
-}
-#[cfg(not(stage0))]
-extern "rust-intrinsic" {
+
     pub fn ctpop8(x: u8) -> u8;
     pub fn ctpop16(x: u16) -> u16;
     pub fn ctpop32(x: u32) -> u32;
@@ -415,29 +413,7 @@ extern "rust-intrinsic" {
     pub fn bswap16(x: u16) -> u16;
     pub fn bswap32(x: u32) -> u32;
     pub fn bswap64(x: u64) -> u64;
-}
 
-// NOTE: remove this after a snap, and merge the extern block above
-macro_rules! stage0_hack {
-    ($( $u_ty:ty, $i_ty:ty => $($name:ident),*);*) => {
-        $(
-            $(
-                #[cfg(stage0)]
-                pub unsafe fn $name(x: $u_ty) -> $u_ty {
-                    extern "rust-intrinsic" { fn $name(x: $i_ty) -> $i_ty; }
-                    $name(x as $i_ty) as $u_ty
-                }
-            )*)*
-    }
-}
-stage0_hack! {
-    u8, i8 => ctpop8, ctlz8, cttz8;
-    u16, i16 => ctpop16, ctlz16, cttz16, bswap16;
-    u32, i32 => ctpop32, ctlz32, cttz32, bswap32;
-    u64, i64 => ctpop64, ctlz64, cttz64, bswap64
-}
-
-extern "rust-intrinsic" {
     pub fn i8_add_with_overflow(x: i8, y: i8) -> (i8, bool);
     pub fn i16_add_with_overflow(x: i16, y: i16) -> (i16, bool);
     pub fn i32_add_with_overflow(x: i32, y: i32) -> (i32, bool);
diff --git a/src/snapshots.txt b/src/snapshots.txt
index 04e82271d87..7f3b9d6b832 100644
--- a/src/snapshots.txt
+++ b/src/snapshots.txt
@@ -1,3 +1,11 @@
+S 2014-04-15 349d66a
+  freebsd-x86_64 0e8078e24b3f86481c5ae0a47a15e5ed2703f241
+  linux-i386 b4e5d104fc2b1eb0236b662ab3cbbb729f789bd6
+  linux-x86_64 c1492f09cfbce535bcf32403cd3aaff84f2094f1
+  macos-i386 e7a093b6c3d45786eeebd73760c4643514ed0c9a
+  macos-x86_64 9401f60e9b6a1d1ae9890a25a512f87c47facc2d
+  winnt-i386 801f7dcaa3117e277981660033869695a9cb865a
+
 S 2014-04-10 e263ef1
   freebsd-x86_64 dc7cfe4266b28f1361b8c2d9ec5bd9ae8ec64e70
   linux-i386 ca0c3b5258dc3eb4a62f0508a662431a4b9cf227