Revert "After nhsetup"

This reverts commit 2a24507232fd609cb83b5d92f3663eac3403efe4.