Merge "Fix typo from previous commit that lead to performance regression."