Revert "Match query using logical AND regex"

This reverts commit 103311beee569ca092ff2fdcc1a5b62f5a5e8d16.

Using lookaheads to simulate logical AND means there are no formal
matches, and therefore no scoring. Boo!