Bug 993401 - Kill spot vs on-demand retry logic. r=catlee