Don't be too greedy. Fix failures caused by 07a3e05.