Revert "Merge pull request #3 from dschmitz/osgi" due to broken dependencies

This reverts commit 5636aa7cd667d55fa78692ac5d015dbdbc1bb3a8, reversing
changes made to 17c5484a5d904fbabd172dbabb1557c2c50a626e.