Revert "Support: Partially revert r249782 to unbreak clang build"