From b0b004b26e273b6549b0cf8b9dab86e540abff99 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Thu, 7 May 2015 17:07:49 +0200
Subject: [PATCH] Revert "Add private and roster local handlers (EJAB-682)" due
 to #556

This reverts commit 2e194bd997132f4fde5959b54e6bfe269d4de433.
---
 src/mod_private.erl | 3 ---
 src/mod_roster.erl  | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/src/mod_private.erl b/src/mod_private.erl
index e127c2029..f09c6100e 100644
--- a/src/mod_private.erl
+++ b/src/mod_private.erl
@@ -60,15 +60,12 @@ start(Host, Opts) ->
     end,
     ejabberd_hooks:add(remove_user, Host, ?MODULE,
 		       remove_user, 50),
-    gen_iq_handler:add_iq_handler(ejabberd_local, Host,
-				  ?NS_PRIVATE, ?MODULE, process_sm_iq, IQDisc),
     gen_iq_handler:add_iq_handler(ejabberd_sm, Host,
 				  ?NS_PRIVATE, ?MODULE, process_sm_iq, IQDisc).
 
 stop(Host) ->
     ejabberd_hooks:delete(remove_user, Host, ?MODULE,
 			  remove_user, 50),
-    gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_PRIVATE),
     gen_iq_handler:remove_iq_handler(ejabberd_sm, Host,
 				     ?NS_PRIVATE).
 
diff --git a/src/mod_roster.erl b/src/mod_roster.erl
index 2f5d771ce..605e8e367 100644
--- a/src/mod_roster.erl
+++ b/src/mod_roster.erl
@@ -100,8 +100,6 @@ start(Host, Opts) ->
 		       webadmin_page, 50),
     ejabberd_hooks:add(webadmin_user, Host, ?MODULE,
 		       webadmin_user, 50),
-    gen_iq_handler:add_iq_handler(ejabberd_local, Host,
-				  ?NS_ROSTER, ?MODULE, process_iq, IQDisc),
     gen_iq_handler:add_iq_handler(ejabberd_sm, Host,
 				  ?NS_ROSTER, ?MODULE, process_iq, IQDisc).
 
@@ -128,7 +126,6 @@ stop(Host) ->
 			  webadmin_page, 50),
     ejabberd_hooks:delete(webadmin_user, Host, ?MODULE,
 			  webadmin_user, 50),
-    gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_ROSTER),
     gen_iq_handler:remove_iq_handler(ejabberd_sm, Host,
 				     ?NS_ROSTER).