Created by: jhchabran
Follow up to @eseliger's great suggestion here https://github.com/sourcegraph/sourcegraph/pull/39031#pullrequestreview-1043381407
Tested locally.