This should also go away with the bundle-aware class loader; please mark FIXME