Fixed build failure due to mismerge.