removed timeout for 2.5 compliance