Dusting this patch off.  Here's a fresh patch!

- Dave