Add uselessgap patch (for 5.9, still should work)