Revert "NC"

This reverts commit f0c350be87586ed0c779a13fefef9f707d791cc5.