This must be dropped and re-implemented on bundle, as with this approach of component is nonsense IMO.