Revert "Merge branch 'wheezy-xivo-bus'"

This reverts commit 59240908fed299508e276196016a9ba9ba8e78f0, reversing
changes made to f4382c56b85aeecd686f5a06e33842cb3146aa8d.