[3.13] GH-129805: Clean up some changes from GH-129806 (GH-133540)

[3.13] GH-129805: Clean up some changes from GH-129806 (GH-133540) #4292