diff --git a/setup/container.sh b/setup/container.sh
index 866875318..a87043c96 100755
--- a/setup/container.sh
+++ b/setup/container.sh
@@ -28,10 +28,6 @@ cp "${container_files}/sudoers" /etc/sudoers.d/yellowtent
 ########## collectd
 rm -rf /etc/collectd
 ln -sfF "${DATA_DIR}/collectd" /etc/collectd
-# collectd 5.4.1 has some bug where we simply cannot get it to create df-vda1
-mkdir -p "${DATA_DIR}/graphite/whisper/collectd/localhost/"
-vda1_id=$(blkid -s UUID -o value /dev/vda1)
-ln -sfF "df-disk_by-uuid_${vda1_id}" "${DATA_DIR}/graphite/whisper/collectd/localhost/df-vda1"
 
 ########## nginx
 # link nginx config to system config
diff --git a/setup/start/collectd.conf b/setup/start/collectd.conf
index 45852966e..e489c0d91 100644
--- a/setup/start/collectd.conf
+++ b/setup/start/collectd.conf
@@ -193,18 +193,12 @@ LoadPlugin write_graphite
 </Plugin>
 
 <Plugin df>
-   # The config below does not work in Ubuntu 15.04 (collectd 5.4.1)
-   # Device "/dev/vda1"
-   # Device "/dev/loop0"
-   # Device "/dev/loop1"
-
-   # ReportByDevice true
-   # IgnoreSelected false
+   Device "/dev/vda1"
+   Device "/dev/loop0"
+   Device "/dev/loop1"
 
    ReportByDevice true
-   FSType "tmpfs"
-   MountPoint "/dev"
-   IgnoreSelected true
+   IgnoreSelected false
 
    ValuesAbsolute true
    ValuesPercentage true