s4-dsdb: rework the NC detection for the descriptor calculation