This reverts commit a2d73f56.
Using clar to propagate the XML settings was a mistake.

(cherry picked from commit 943181c2)