diff --git a/.pylintrc b/.pylintrc
index 15062dca9c66fffec131af4f56a5061146c29104..188b7d7058e89de13d6a1ca31f4041d38e057be8 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -25,7 +25,6 @@ notes=FIXME,XXX
 #TODO: Enable locally-disabled
 #TODO: Enable protected-access
 #TODO: Enable no-name-in-module
-#TODO: Enable wrong-import-order
 # TODO(https://github.com/PyCQA/pylint/issues/59#issuecomment-283774279):
 # enable cyclic-import after a 1.7-or-later pylint release that recognizes our
 # disable=cyclic-import suppressions.
@@ -35,4 +34,4 @@ notes=FIXME,XXX
 #TODO: Enable useless-else-on-loop
 #TODO: Enable too-many-nested-blocks
 
-disable=missing-docstring,too-few-public-methods,no-init,duplicate-code,invalid-name,locally-disabled,protected-access,no-name-in-module,wrong-import-order,cyclic-import,too-many-instance-attributes,too-many-lines,import-error,useless-else-on-loop,too-many-nested-blocks
+disable=missing-docstring,too-few-public-methods,no-init,duplicate-code,invalid-name,locally-disabled,protected-access,no-name-in-module,cyclic-import,too-many-instance-attributes,too-many-lines,import-error,useless-else-on-loop,too-many-nested-blocks
diff --git a/src/python/grpcio/grpc/_server.py b/src/python/grpcio/grpc/_server.py
index 9e2d40b67d1c0e417ce2677f98ef64918377d6a6..cd59b07c04ccad1337f5b6368cdff6f483da6f77 100644
--- a/src/python/grpcio/grpc/_server.py
+++ b/src/python/grpcio/grpc/_server.py
@@ -16,10 +16,11 @@
 import collections
 import enum
 import logging
-import six
 import threading
 import time
 
+import six
+
 import grpc
 from grpc import _common
 from grpc._cython import cygrpc