And here's the actual patch which I forgot to supply.