Remove filter fix from .17