Make clang turn back into Dr Banner.

(cherry picked from commit 248c7c646eceff13807ccbb51968de5611b06718)