Remove forgotten prefix, add failure on timeout to address review
comments.