Fix how this is enabled and make the timeout configurable.