Correct to make sure it's == to what we have in #1897.
Merge pull request #1909 from ktf/fix-rebase

Correct to make sure it's == to what we have in #1897.