Reland r216439 215441, majnemer has a real fix for PR20771.