Reverted varying timeout (GJ Martin)