Add missing debug patch not applied upstream.