Revert "TNR"

This reverts commit 57266d23febc97de75e764f7e361b914adfba42c.