Revert "Fix dependencies for server module"

This reverts commit ad7307ea573428f9f4cd07ac687e9e754bf01520.