s
r
Merge branch 'nt2'
Revert "Merge branch 'nt2'"

This reverts commit b99e55a9a04729a35e11e242cf4d63dfb3541848, reversing
changes made to 2601171018dd4eb57eb60d08f39fdd7f016ea4c2.