Fix build.
Merge pull request #1816 from jimis/cfupgrade

Fix build.