diff --git a/lib/hdb/common.c b/lib/hdb/common.c
index f090fd35e..55857723f 100644
--- a/lib/hdb/common.c
+++ b/lib/hdb/common.c
@@ -98,13 +98,6 @@ hdb_value2entry_alias(krb5_context context, krb5_data *value,
     return decode_hdb_entry_alias(value->data, value->length, ent, NULL);
 }
 
-krb5_error_code
-_hdb_fetch(krb5_context context, HDB *db, krb5_const_principal principal,
-	   unsigned flags, hdb_entry_ex *entry)
-{
-    return _hdb_fetch_kvno(context, db, principal, flags & (~HDB_F_KVNO_SPECIFIED), 0, entry);
-}
-
 krb5_error_code
 _hdb_fetch_kvno(krb5_context context, HDB *db, krb5_const_principal principal,
 		unsigned flags, krb5_kvno kvno, hdb_entry_ex *entry)
diff --git a/lib/hdb/db.c b/lib/hdb/db.c
index 47203d2a8..69940edf8 100644
--- a/lib/hdb/db.c
+++ b/lib/hdb/db.c
@@ -318,7 +318,6 @@ hdb_db_create(krb5_context context, HDB **db,
     (*db)->hdb_capability_flags = HDB_CAP_F_HANDLE_ENTERPRISE_PRINCIPAL;
     (*db)->hdb_open = DB_open;
     (*db)->hdb_close = DB_close;
-    (*db)->hdb_fetch = _hdb_fetch;
     (*db)->hdb_fetch_kvno = _hdb_fetch_kvno;
     (*db)->hdb_store = _hdb_store;
     (*db)->hdb_remove = _hdb_remove;
diff --git a/lib/hdb/db3.c b/lib/hdb/db3.c
index 4ac002519..58f892ff6 100644
--- a/lib/hdb/db3.c
+++ b/lib/hdb/db3.c
@@ -348,7 +348,6 @@ hdb_db_create(krb5_context context, HDB **db,
     (*db)->hdb_capability_flags = HDB_CAP_F_HANDLE_ENTERPRISE_PRINCIPAL;
     (*db)->hdb_open  = DB_open;
     (*db)->hdb_close = DB_close;
-    (*db)->hdb_fetch = _hdb_fetch;
     (*db)->hdb_fetch_kvno = _hdb_fetch_kvno;
     (*db)->hdb_store = _hdb_store;
     (*db)->hdb_remove = _hdb_remove;
diff --git a/lib/hdb/hdb-keytab.c b/lib/hdb/hdb-keytab.c
index 348505345..29cc97751 100644
--- a/lib/hdb/hdb-keytab.c
+++ b/lib/hdb/hdb-keytab.c
@@ -221,7 +221,6 @@ hdb_keytab_create(krb5_context context, HDB ** db, const char *arg)
     (*db)->hdb_openp = 0;
     (*db)->hdb_open = hkt_open;
     (*db)->hdb_close = hkt_close;
-    (*db)->hdb_fetch = hkt_fetch;
     (*db)->hdb_fetch_kvno = hkt_fetch_kvno;
     (*db)->hdb_store = hkt_store;
     (*db)->hdb_remove = NULL;
diff --git a/lib/hdb/hdb-ldap.c b/lib/hdb/hdb-ldap.c
index fcf85a59e..b20f2c031 100644
--- a/lib/hdb/hdb-ldap.c
+++ b/lib/hdb/hdb-ldap.c
@@ -1878,7 +1878,6 @@ hdb_ldap_common(krb5_context context,
     (*db)->hdb_capability_flags = 0;
     (*db)->hdb_open = LDAP_open;
     (*db)->hdb_close = LDAP_close;
-    (*db)->hdb_fetch = LDAP_fetch;
     (*db)->hdb_fetch_kvno = LDAP_fetch_kvno;
     (*db)->hdb_store = LDAP_store;
     (*db)->hdb_remove = LDAP_remove;
diff --git a/lib/hdb/hdb-mitdb.c b/lib/hdb/hdb-mitdb.c
index 327117e34..0d5b26316 100644
--- a/lib/hdb/hdb-mitdb.c
+++ b/lib/hdb/hdb-mitdb.c
@@ -743,7 +743,6 @@ hdb_mdb_create(krb5_context context, HDB **db,
     (*db)->hdb_capability_flags = 0;
     (*db)->hdb_open = mdb_open;
     (*db)->hdb_close = mdb_close;
-    (*db)->hdb_fetch = mdb_fetch;
     (*db)->hdb_fetch_kvno = mdb_fetch_kvno;
     (*db)->hdb_store = mdb_store;
     (*db)->hdb_remove = mdb_remove;
diff --git a/lib/hdb/hdb-sqlite.c b/lib/hdb/hdb-sqlite.c
index a8da7a8a8..f64830d5b 100644
--- a/lib/hdb/hdb-sqlite.c
+++ b/lib/hdb/hdb-sqlite.c
@@ -875,7 +875,6 @@ hdb_sqlite_create(krb5_context context, HDB **db, const char *argument)
     (*db)->hdb_unlock = hdb_sqlite_unlock;
     (*db)->hdb_firstkey = hdb_sqlite_firstkey;
     (*db)->hdb_nextkey = hdb_sqlite_nextkey;
-    (*db)->hdb_fetch = hdb_sqlite_fetch;
     (*db)->hdb_fetch_kvno = hdb_sqlite_fetch_kvno;
     (*db)->hdb_store = hdb_sqlite_store;
     (*db)->hdb_remove = hdb_sqlite_remove;
diff --git a/lib/hdb/hdb.h b/lib/hdb/hdb.h
index 698356407..1b0468a48 100644
--- a/lib/hdb/hdb.h
+++ b/lib/hdb/hdb.h
@@ -74,7 +74,7 @@ typedef struct hdb_master_key_data *hdb_master_key;
 /**
  * hdb_entry_ex is a wrapper structure around the hdb_entry structure
  * that allows backends to keep a pointer to the backing store, ie in
- * ->hdb_fetch(), so that we the kadmin/kpasswd backend gets around to
+ * ->hdb_fetch_kvno(), so that we the kadmin/kpasswd backend gets around to
  * ->hdb_store(), the backend doesn't need to lookup the entry again.
  */
 
@@ -123,15 +123,6 @@ typedef struct HDB{
      * Free an entry after use.
      */
     void	    (*hdb_free)(krb5_context, struct HDB*, hdb_entry_ex*);
-    /**
-     * Fetch an entry from the backend
-     *
-     * Fetch an entry from the backend, flags are what type of entry
-     * should be fetch: client, server, krbtgt.
-     */
-    krb5_error_code (*hdb_fetch)(krb5_context, struct HDB*,
-				 krb5_const_principal, unsigned, 
-				 hdb_entry_ex*);
     /**
      * Fetch an entry from the backend
      *
diff --git a/lib/hdb/keytab.c b/lib/hdb/keytab.c
index b8cc0d47e..05b78dafc 100644
--- a/lib/hdb/keytab.c
+++ b/lib/hdb/keytab.c
@@ -211,17 +211,10 @@ hdb_get_entry(krb5_context context,
 	goto out2;
     }
     
-    if (*db->hdb_fetch_kvno) {
-	    ret = (*db->hdb_fetch_kvno)(context, db, principal,
-					HDB_F_DECRYPT|HDB_F_KVNO_SPECIFIED|
-					HDB_F_GET_CLIENT|HDB_F_GET_SERVER|HDB_F_GET_KRBTGT,
-					kvno, &ent);
-    } else {
-	    ret = (*db->hdb_fetch)(context, db, principal,
-				   HDB_F_DECRYPT|
-				   HDB_F_GET_CLIENT|HDB_F_GET_SERVER|HDB_F_GET_KRBTGT,
-				   &ent);
-    }
+    ret = (*db->hdb_fetch_kvno)(context, db, principal,
+				HDB_F_DECRYPT|HDB_F_KVNO_SPECIFIED|
+				HDB_F_GET_CLIENT|HDB_F_GET_SERVER|HDB_F_GET_KRBTGT,
+				kvno, &ent);
 
     if(ret == HDB_ERR_NOENTRY) {
 	ret = KRB5_KT_NOTFOUND;
diff --git a/lib/hdb/ndbm.c b/lib/hdb/ndbm.c
index 7728230d3..5b2c07e5f 100644
--- a/lib/hdb/ndbm.c
+++ b/lib/hdb/ndbm.c
@@ -370,7 +370,6 @@ hdb_ndbm_create(krb5_context context, HDB **db,
     (*db)->hdb_capability_flags = HDB_CAP_F_HANDLE_ENTERPRISE_PRINCIPAL;
     (*db)->hdb_open = NDBM_open;
     (*db)->hdb_close = NDBM_close;
-    (*db)->hdb_fetch = _hdb_fetch;
     (*db)->hdb_fetch_kvno = _hdb_fetch_kvno;
     (*db)->hdb_store = _hdb_store;
     (*db)->hdb_remove = _hdb_remove;