Created by: beyang
Address https://github.com/sourcegraph/sourcegraph/pull/2697#discussion_r265863378 and https://github.com/sourcegraph/sourcegraph/pull/2697#discussion_r265864677