As discussed in NYC LN Summit + described here https://github.com/lightning/bolts/pull/1096