In attachment 838069 [details] you can find a suggested patch that would make me sleep better regarding this. Can you approach upstream with this?