diff --git a/lib/query.c b/lib/query.c
index 739a0deb8..b3c190cb2 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -594,14 +594,7 @@ int rpmcliQuery(rpmts ts, QVA_t qva, char * const * argv)
 	qva->qva_queryFormat = fmt;
     }
 
-    if (!(qva->qva_source & RPMQV_RPM) &&
-	rpmExpandNumeric("%{?_vsflags_query_rpmdb:1}")) {
-
-	vsflags = rpmExpandNumeric("%{?_vsflags_query_rpmdb}");
-    } else {
-	vsflags = rpmExpandNumeric("%{?_vsflags_query}");
-    }
-
+    vsflags = rpmExpandNumeric("%{?_vsflags_query}");
     if (rpmcliQueryFlags & VERIFY_DIGEST)
 	vsflags |= _RPMVSF_NODIGESTS;
     if (rpmcliQueryFlags & VERIFY_SIGNATURE)
diff --git a/macros.in b/macros.in
index 3f07020c6..8bb9decf6 100644
--- a/macros.in
+++ b/macros.in
@@ -664,7 +664,6 @@ package or when debugging this package.\
 %_vsflags_erase		%{__vsflags}
 %_vsflags_install	%{__vsflags}
 %_vsflags_query		%{__vsflags}
-%_vsflags_query_rpmdb	0xf0f00
 %_vsflags_rebuilddb	0xc0c00
 %_vsflags_verify	%{__vsflags}