Revert "initial change to be osgi useable"

This reverts commit cdead831880eb34c13f00fdb04295f3ca905d772.