Revert "Use bus extension for OSGi and non OSGi case"

This reverts commit 4b9cc2c740d26e04da1ef5e32f423fde0bb3294e.