rebuild server

This reverts commit f59641c2983778f1d2ab32e8aaed18bea66f0b1d, reversing
changes made to 24f8ed7838cfcceaf9ee7382f13d0d693177557a.