Reverted timeout changes and added clarifying comment.