This reverts commit 727f4479. This comment is unnecessary after #3180. [ci skip] (cherry picked from commit 89c24c93)