Revert "Use new, simpler way of chaining hwsd filters"

This reverts commit fb2f343a152978b7fa606693d03dd9a7918d061c.