Initial fix for timer claaback change. Still needs work but passes
now. #4129