Revert "Merge branch 'self-hosted'"

This reverts commit 58657ef698cb4e57e53fc8e45041fb6b50389cbc, reversing
changes made to 8dacb31224e484942ee7732dc1546b59ee204d79.