Revert "Split out the server part, which we'll release later"

This reverts commit 93a77c82bab4cd3505c309af9498a6813a5d1b19.