Revert "S66833: RPB - Update filter to work with the entire board"

This reverts commit 8c73d4a8fa08a248263db4060269cae0303e764b.