Bug 890853. r=rstrong.