Re-enabling single server support