So that NONET and SRB2DD builds are fixed.
Targeting master because this does not affect regular builds.