Revised and retested patch attached.

OK to commit?

--Douglas Rupp