Created by: efritz
This closes https://github.com/sourcegraph/sourcegraph/issues/14568 and should get it before branch cut.