
Automatic merge from submit-queue (batch tested with PRs 45283, 45289, 45248, 44295) Remove offending code due to bad rebase **What this PR does / why we need it**: Fix bug introduced by bad rebasing **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ``` NONE ```