Remove commented code.

4 jobs for cherry-pick-eb123484 in 26 minutes and 35 seconds (queued for 26 minutes and 38 seconds)