Fix previous change, for NS builds that are not self-contained