Bug 804979, r=rstrong