[stella/f26] (2 commits) ...Drop backported patch