Fix layout derp from merge.