I did the simple fix for 2.0 as well since there's no reason not to, even when we de-dupe the charm info.
I did the simple fix for 2.0 as well since there's no reason not to, even when we de-dupe the charm info.