reverse some modifications to puppet / mcollective which seem problematic