[#534] Temp workaround for freezes caused by the info middleware