Some more tinkering with Bug#16051.