Rather than overriding the component, is there something we can do that makes the component work in both scenarios?