Use context.AfterFunc() instead of a goroutine to track timeouts

Use context.AfterFunc() instead of a goroutine to track timeouts #661