Revert "remove more of ClientSystem"

This reverts commit a7ed49f590e17726d1cf7927da95e92de0bd8839.