dbus: revert r25156 (Fix dbus dependency on libxml2, without rebuild, works...

dbus: revert r25156 (Fix dbus dependency on libxml2, without rebuild, works but may need refinement)

As discussed on the list - Too complicated and wrong.