reminder: this bit shouldn't merge, but get updated to a new tag of erchef.