Don't use message_timeout in master yet