Reverted WITH_SERVER to OFF