More work on change for start_timeout.
Make spec tests work again.