Fixed the build error from a bad merge.