Fix merge issue.
Merge pull request #1440 from palantir/fix_merge

Fix merge issue.