Reverting "fix-lightning-crash-maybe", since @KA101 reported a problem.