keep this consistent with 3.x changes on #33587