Revert Server.php changes