back out some changes to ndt, due to crashes