Bug 1090776 - Bug 1090776 - Prevent DataClaneError. r=hsinyi, a=2.0m+