Evil hack to restore nosend to client