To be merged only after !156 (merged) and !157 (merged)
Drop the untared charts and rely on upstream ones.