Attempt to cherry-pick c424b2f9299e3338f7c462ec0885e15da78ddffe