This commit partially reverts39786e4790andc5c843696b, as the approach taken did not take into account request predicates that query request attributes, including path variables. Closes gh-31732
This commit partially reverts39786e4790andc5c843696b, as the approach taken did not take into account request predicates that query request attributes, including path variables. Closes gh-31732