Merge "Revert "Work around new clang compiler warning.""