Created by: slimsag
Stacked on top of #26486
Helps #21938
Signed-off-by: Stephen Gutekanst stephen@sourcegraph.com