Revert "avserver: fix build after the next bump."