The attached patch should prevent dig looping.  It is yet to be reviewed internally.