Revert "synch on NF"

This reverts commit 933f53c948f86c554422ea511216c62664f3683b.
synch on NF (lite)