Commit for Ulf Review
Now works for collectd