Created by: lguychard
Fixes #4034
This was broken by https://github.com/sourcegraph/sourcegraph/pull/3826/