This is better approach not only because we can potentially upstream
this but also because it covers all packages and breaks potentially if
new variant is added.