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