Revert "Fix warnings from rustc 1.65.0"

This reverts commit 8bf8097d.

Reason for revert: This was incorectly cherry-picked, revert
                   to reland later in a clean cherry pick

Change-Id: If0ab2d3837eae27c3cd03266487c796b6a95bef7
Merged-In: I6a3183f84111359f0cb1ebf86b1f8c5a76501669