Bug 828196 - Workaround bug 823418 in Gaia