Update client from contrib folder and disable some code that was crashing server