Bug 1081854: GAIA follow-up to Bug 978639 (for GCF case 31.4.2.1.3)