Have we verified what @jcoyne suggested?  If so, sounds like a good delta before a merge.