Re #6522. Another holdover bug in NOMAD.