#13783 introduced an option to disable an optional section.

We should instead use a generic soltuion for enabling/disabling