Null merge for reverted fix for #13807.