Revert KARAF-2761 and the standalone extender for annotations from KARAF-2763