Unreviewed, fix CMake build. This got messed up when rebasing.