Our patch from PR #189312 wasn't complete; let's take the upstream one. I tested on 31st that it really passes now.