Revert "Bug 1081854: GAIA follow-up to Bug 978639 (for GCF case 31.4.2.1.3). r=drs"

This reverts commit 8ad73b2fa8e1019dcb828c572c742fd55f1e0a18.