That's the gist of it yes.
The regs don't mention HIDs, they just say that "With a light source producing the principal dipped beam and having an objective luminous flux which exceeds 2,000 lumen" must have cleaning devices and cannot use the provision in the regs that allows manual adjustment...