Fix previous change for Bug#6988.