Revert "Pulling rework (#20906)" This reverts commit 0d8254b2a2. (cherry picked from commit c15b0691ec)
0d8254b2a2
c15b0691ec