Revert "Also filter by app_id"

This reverts commit 7d58e7881bf207f9309d22ff4c2813e220e3a307.