Add ability for methods to skip the artificial timeout (#3007)

Add ability for methods to skip the artificial timeout (#3007) #7075