Bug 877610, work around more data weirdness