Make PID filtering work properly by removing the streams and not just the entries from the PAT.
(cherry picked from commit 61f9ac9a8d7f6eb5cf1fac74376245e8b82e42f1)