Rollback this change because teams are using this behavior.
Homogenize timeout #258