Fix component coordination due to bad merge.