am 2aa1d18e: Fix bug 17931760 - spurious timeout leads to mayhem

* commit '2aa1d18e3acd269ed7a5f5a4843d447735f0676c':
  Fix bug 17931760 - spurious timeout leads to mayhem