Be more careful with proxy delays.  Should help #673