I believe I've posted this before, but let's try again...  I've been
using this patch for quite a while: