Merge pull request #5592 from annando/avoid-probe