Merge branch 'master' into update-couchdb-defaults
diff --git a/src/dreyfus/src/clouseau_rpc.erl b/src/dreyfus/src/clouseau_rpc.erl
index 38247ff..b8190b3 100644
--- a/src/dreyfus/src/clouseau_rpc.erl
+++ b/src/dreyfus/src/clouseau_rpc.erl
@@ -98,13 +98,8 @@
         true ->
             true;
         false ->
-            % We might have just booted up, so let's send a test RPC
-            case (catch version()) of
-                {ok, _} ->
-                    true;
-                _Err ->
-                    false
-            end
+            % We might have just booted up, so let's ping
+            pong == net_adm:ping(clouseau())
     end.
 
 rpc(Ref, Msg) ->