Bug 877986. r=bhackett