diff --git a/roles/apache/defaults/main.yml b/roles/apache/defaults/main.yml
deleted file mode 100644
index 372da7ba0c..0000000000
--- a/roles/apache/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-collectd_apache: true
diff --git a/roles/collectd/base/tasks/main.yml b/roles/collectd/base/tasks/main.yml
index 4e6d718d04..210e7d9c99 100644
--- a/roles/collectd/base/tasks/main.yml
+++ b/roles/collectd/base/tasks/main.yml
@@ -46,7 +46,7 @@
   - collectd
   notify:
   - restart collectd
-  when: collectd_apache is defined && env == 'staging'
+  when: collectd_apache is defined
 
 - name: /etc/collectd/apache.conf
   copy: src=apache.conf dest=/etc/collectd.d/apache.conf
@@ -54,7 +54,7 @@
   - collectd
   notify:
   - restart collectd
-  when: collectd_apache is defined && env == 'staging'
+  when: collectd_apache is defined
 
 
 # Three tasks for handling our (two) custom selinux modules.