Reverting all the dbus related commits (sigh) from 27th July and fixing a QA issue...