Update from_collectd

merge gone wrong...