Revert "More Surge integration."

This reverts commit a9c7b3cc26a4e79a8e7e35641573c3d424ba74f0.