fix bad merge
Created by: slimsag
https://github.com/sourcegraph/sourcegraph/pull/10464 The build passed and there were no merge conflicts, but by the time I merged there were and it broke CI. This addresses it.
Created by: slimsag
https://github.com/sourcegraph/sourcegraph/pull/10464 The build passed and there were no merge conflicts, but by the time I merged there were and it broke CI. This addresses it.