Semi-revert commit 3784d76 as the filter chaining is needed.