Partial revert of commit c6d8683 to fix a GN + Win/Clang build warning.