Address post-merge feedback from #2966
Created by: chrismwendt
Addresses post-merge feedback from https://github.com/sourcegraph/sourcegraph/pull/2966
Created by: chrismwendt
Addresses post-merge feedback from https://github.com/sourcegraph/sourcegraph/pull/2966