Revert "NFC Remover for old tree builds"

This reverts commit 3c5cc4f9e33f8db0f971c3b7f1c52c1efe40bb90.