Fix strange bug from merge/fast-forward madness.