Bug 938322. Address review comment. r=gbrown