Bug 913903 - Address review comment.