Fix inaccurate cherry-pick in a3ffd48945.