Bug 964187. Address review comment.