diff --git a/ipc/codegen/src/codegen.rs b/ipc/codegen/src/codegen.rs
index 7341cc220..c73bed22f 100644
--- a/ipc/codegen/src/codegen.rs
+++ b/ipc/codegen/src/codegen.rs
@@ -412,21 +412,18 @@ fn implement_client_method_body(
 		vec![]
 	};
 
-	let wait_result_stmt = quote_stmt!(cx, while !socket.ready().load(::std::sync::atomic::Ordering::Relaxed) { });
 	if let Some(ref return_ty) = dispatch.return_type_ty {
 		let return_expr = quote_expr!(cx,
 			::bincode::serde::deserialize_from::<_, $return_ty>(&mut socket, ::bincode::SizeLimit::Infinite).unwrap()
 		);
 		quote_expr!(cx, {
 			$request
-			$wait_result_stmt
 			$return_expr
 		})
 	}
 	else {
 		quote_expr!(cx, {
 			$request
-			$wait_result_stmt
 		})
 	}
 }
diff --git a/ipc/rpc/src/interface.rs b/ipc/rpc/src/interface.rs
index a4e2b3c05..247b5339b 100644
--- a/ipc/rpc/src/interface.rs
+++ b/ipc/rpc/src/interface.rs
@@ -79,11 +79,7 @@ pub fn invoke<W>(method_num: u16, params: &Option<Vec<u8>>, w: &mut W) where W:
 
 /// IpcSocket
 pub trait IpcSocket: Read + Write + Sync {
-	fn ready(&self) -> AtomicBool;
 }
 
 impl IpcSocket for ::devtools::TestSocket {
-	fn ready(&self) -> AtomicBool {
-		AtomicBool::new(true)
-	}
 }