Switch back to vanilla charm-helpers after fix landed.