Fix timeout configuration for 2.2.x

See #ce05484c2955de7c131ba47065842d40f0af7fb4 for the fix on master