Bug 968199. r=backout