Add some checks to use the Util.shouldUseNsd flag