Resolves the clang build issue in a more unintrusive way.