Revert^2 "Refactor ApfFilter constructor"

This reverts commit b712624b14cfe826ea8085a78dcac8acd58cc2f7.

Reason for revert: reapply the change with bug fix

Change-Id: Ibc57cd4ccc0d4dcb4952a8ab2914bf9ea44a3c3b
3 files changed