Drop the now-unnecessary ServerUtil trait.

Upstream has fixed all the problems preventing the proper solution.