Reverted back to single server