I put back the code needed for chattest