Revert "dont accidentally trigger the last match"

This reverts commit 1b878ffb.

works as expected in master (nee 4.10); not sure why it does not in 4.9
and i don't have the time to suss it out. it can remain broken the way it
was prior to this commit in 4.9.

BUG:309787