This reverts commit 2ee6af7a.

Initial port of the D9 version

The previous patch and approach could break sites/views if a filter is removed
in the wrong place

Adapted for 8.x

different way of checking for a handler different than itself, one that doesn't involve comparing an entire object as this can fail on some configurations