Add a shorter timeout, this should be user-accessible at some point.