Fix brokenness from merge.