I see no reason to patch it at build time the way we did it. Will-Fix: #10606
mentioned in issue #10606 (closed)