Work around latest breakage introduced by Apple.