[3.12] gh-124309: Revert eager task factory fix to prevent breaking downstream (GH-124810)#124817