Revert "Detect scope after filter has executed to allow for scope to change during filter execution."

This reverts commit 2435403b88dc5ae57909ede6a9b6c9e151388a56.