diff --git a/src/ejabberd_receiver.erl b/src/ejabberd_receiver.erl
index 71ae8e409..55ebdbed4 100644
--- a/src/ejabberd_receiver.erl
+++ b/src/ejabberd_receiver.erl
@@ -76,9 +76,8 @@ start(Socket, SockMod, Shaper) ->
             non_neg_integer() | infinity) -> undefined | pid().
 
 start(Socket, SockMod, Shaper, MaxStanzaSize) ->
-    {ok, Pid} =
-	supervisor:start_child(ejabberd_receiver_sup,
-			       [Socket, SockMod, Shaper, MaxStanzaSize]),
+    {ok, Pid} = ?GEN_SERVER:start(ejabberd_receiver,
+				  [Socket, SockMod, Shaper, MaxStanzaSize], []),
     Pid.
 
 -spec change_shaper(pid(), shaper:shaper()) -> ok.
diff --git a/src/ejabberd_sup.erl b/src/ejabberd_sup.erl
index e8d3ce830..e6b30a3d6 100644
--- a/src/ejabberd_sup.erl
+++ b/src/ejabberd_sup.erl
@@ -97,14 +97,6 @@ init([]) ->
 	 infinity,
 	 supervisor,
 	 [ejabberd_listener]},
-    ReceiverSupervisor =
-	{ejabberd_receiver_sup,
-	 {ejabberd_tmp_sup, start_link,
-	  [ejabberd_receiver_sup, ejabberd_receiver]},
-	 permanent,
-	 infinity,
-	 supervisor,
-	 [ejabberd_tmp_sup]},
     S2SInSupervisor =
 	{ejabberd_s2s_in_sup,
 	 {ejabberd_tmp_sup, start_link,
@@ -162,7 +154,6 @@ init([]) ->
 	   S2S,
 	   Local,
 	   Captcha,
-	   ReceiverSupervisor,
 	   S2SInSupervisor,
 	   S2SOutSupervisor,
 	   ServiceSupervisor,