diff --git a/install/tools/ipa-managed-entries b/install/tools/ipa-managed-entries
index c786e883a..8a89da8a8 100755
--- a/install/tools/ipa-managed-entries
+++ b/install/tools/ipa-managed-entries
@@ -132,8 +132,7 @@ def main():
 
         disabled = True
         try:
-            [entry] = conn.get_entries(def_dn, conn.SCOPE_BASE,
-                                       filter, ['originfilter'])
+            entry = conn.get_entry(def_dn)
             disable_attr = '(objectclass=disable)'
             try:
                 org_filter = entry.single_value.get('originfilter')
diff --git a/make-lint b/make-lint
index b1780f94a..df829580b 100755
--- a/make-lint
+++ b/make-lint
@@ -279,7 +279,6 @@ def main():
         linter.set_option('disable', 'unused-argument')
         linter.set_option('disable', 'unused-variable')
         linter.set_option('disable', 'useless-else-on-loop')
-        linter.set_option('disable', 'unbalanced-tuple-unpacking')
 
         linter.set_option('enable', 'C')
         linter.set_option('disable', 'bad-classmethod-argument')