Old clang build fix, attempt #2