Revert "Do screen filtering by screen geometry rather than number."
This reverts commit 332b96b3632d0fc4b3bbd21907127093f0988e45.