Removed unrelated change that slipped into r57769