Correct patch attached -- third attempt.

(Sorry about the noise -- it was created in the "test" subdirectory
and I mixed it up.)