Fix merge issue, which resulted compilation error.
Merge pull request #1168 from palantir/compiler_err

Fix merge issue, which resulted compilation error.