am 38e561dd: Merge "Remove timeout support." into gingerbread

* commit '38e561dd3cd72160035d8b3002fc9bbaf3071374':
  Remove timeout support.