Revert changes except for core's osgi stuff