Fixed build failure due to bad merge.