This reverts PR #35460 & commit 551c37167b. (cherry picked from commit bb0358dd8d)
551c37167b
bb0358dd8d