Bug 874974. r=bhackett