Rolling back removed code in the GenericBundleActivator #5043