Per report from Jim Rosenberg.  This possibly should get back-patched,
but I'm a bit suspicious of it still because of the lack of prior reports.