Revert "FilterProject"

This reverts commit b3aacd64b5b439e70565b7e292d6798b0da3e11c.
Revert "Revert "FilterProject""

This reverts commit 5b9e08a247aab149a6055633527c0ff7ac9ef3d7.