addressing comment on 7cf5d77, added shorter more reliable timeout (couldn't easily remove it)