diff --git a/neutron/extensions/_empty_string_filtering_lib.py b/neutron/extensions/_empty_string_filtering_lib.py
deleted file mode 100644
index c00ecc860a5..00000000000
--- a/neutron/extensions/_empty_string_filtering_lib.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""
-TODO(hongbin): This module should be deleted once neutron-lib containing
-https://review.openstack.org/#/c/565342/ change is released.
-"""
-
-
-ALIAS = 'empty-string-filtering'
-IS_SHIM_EXTENSION = True
-IS_STANDARD_ATTR_EXTENSION = False
-NAME = 'Empty String Filtering Extension'
-DESCRIPTION = 'Allow filtering by attributes with empty string value'
-UPDATED_TIMESTAMP = '2018-04-09T10:00:00-00:00'
-RESOURCE_ATTRIBUTE_MAP = {}
-SUB_RESOURCE_ATTRIBUTE_MAP = {}
-ACTION_MAP = {}
-REQUIRED_EXTENSIONS = []
-OPTIONAL_EXTENSIONS = []
-ACTION_STATUS = {}
diff --git a/neutron/extensions/empty_string_filtering.py b/neutron/extensions/empty_string_filtering.py
index bd69ffde7b7..4ad992dc0ac 100644
--- a/neutron/extensions/empty_string_filtering.py
+++ b/neutron/extensions/empty_string_filtering.py
@@ -10,10 +10,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron_lib.api.definitions import empty_string_filtering as apidef
 from neutron_lib.api import extensions
 
-from neutron.extensions import _empty_string_filtering_lib as apidef
-
 
 class Empty_string_filtering(extensions.APIExtensionDescriptor):
     api_definition = apidef