Try reverting most of charmhelpers to the old version