This reverts commit c971c851d3.
This change was part of the still-under-review patch D11489, which
hasn't been accepted yet.
This reverts commit c971c851d3.
This change was part of the still-under-review patch D11489, which
hasn't been accepted yet.