diff --git a/manifests/init.pp b/manifests/init.pp
index 70d492609..10e210070 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -180,9 +180,6 @@
     'DEFAULT/metering_secret'        : value => $metering_secret;
     'DEFAULT/debug'                  : value => $debug;
     'DEFAULT/verbose'                : value => $verbose;
-    # Fix a bad default value in ceilometer.
-    # Fixed in https://review.openstack.org/#/c/18487/
-    'DEFAULT/glance_control_exchange': value => 'glance';
     'DEFAULT/notification_topics'    : value => 'notifications';
   }
 
diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb
index 9a19d51f5..977a5a16f 100644
--- a/spec/classes/ceilometer_init_spec.rb
+++ b/spec/classes/ceilometer_init_spec.rb
@@ -153,10 +153,6 @@
       it { should contain_ceilometer_config('DEFAULT/syslog_log_facility').with_value('LOG_LOCAL0') }
     end
 
-    it 'fixes a bad value in ceilometer (glance_control_exchange)' do
-      should contain_ceilometer_config('DEFAULT/glance_control_exchange').with_value('glance')
-    end
-
     it 'configures notification_topics' do
       should contain_ceilometer_config('DEFAULT/notification_topics').with_value('notifications')
     end