Revert "[GEOS-6683] Ignore numberMatched per layer"

This reverts commit 8647f9696eb92a90def560018d9aeb794a656eba.