diff --git a/templates/metering_agent.ini.j2 b/templates/metering_agent.ini.j2
index 4b130805..0a461af6 100644
--- a/templates/metering_agent.ini.j2
+++ b/templates/metering_agent.ini.j2
@@ -6,15 +6,7 @@ debug = {{ debug }}
 
 # Drivers
 driver = {{ neutron_driver_metering }}
-
-# Other agents will use neutron_plugins[neutron_plugin_type].driver_interface
-# for the interface_driver, but that uses a stevedore alias. Metering agent
-# hasn't been updated to use stevedore alises so that fails. To work around
-# the problem until metering agent is updated, we should use the full
-# module.class path to the interface driver.
-# TODO(hughsaunders): switch back to stevedore when
-# https://review.openstack.org/#/c/419881/ merges and is backported.
-interface_driver = {{ neutron_services['neutron-metering-agent'].interface_driver }}
+interface_driver = {{ neutron_plugins[neutron_plugin_type].driver_interface }}
 
 # Intervals
 measure_interval = 30
diff --git a/vars/main.yml b/vars/main.yml
index 9477dbda..23790d1b 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -403,7 +403,6 @@ neutron_services:
     config_overrides: "{{ neutron_metering_agent_ini_overrides }}"
     config_type: "ini"
     init_config_overrides: "{{ neutron_metering_agent_init_overrides }}"
-    interface_driver: "{{ (neutron_plugin_type == 'ml2.lxb') | ternary('linuxbridge', 'openvswitch') }}"
     start_order: 3
   neutron-l3-agent:
     group: neutron_l3_agent