Removed unintended server entity design leakage.