Revert fix for #13807 mistakenly applied in this branch.
1 file changed