Merge pull request #966 from TheBlueMatt/2021-06-workaround-broken-lnd