542 reverted

Somewhere in the slew of recent pull requests it looks like #542 was reverted. The functionality is still there, we just have to re-add the before filter