Revert "Merge branch 'self-hosted'"

This reverts commit 58657ef698cb4e57e53fc8e45041fb6b50389cbc, reversing
changes made to b4313e7caf522609d85d832f2724a89620fd1ea5.