Fix derp in latter cherry-pick.