Revert 8804332 and 1d15648

Created by: bobheadxi

• Revert https://github.com/sourcegraph/sourcegraph/commit/880433282bc51d1e6483154ce15c79b10285eb36
• Revert https://github.com/sourcegraph/sourcegraph/commit/1d156480334045da9101791b18709113cf4bca6c

Puppeteer check that was failing now passes: https://buildkite.com/sourcegraph/sourcegraph/builds/127024#3178b2c1-02bf-4b6a-9ab1-7e4e4f9efe37

I had to revert both due to extensive conflicts when only reverting https://github.com/sourcegraph/sourcegraph/commit/880433282bc51d1e6483154ce15c79b10285eb36