Bug#867299: upstream

[Chris Zubrzycki]

This is/was an upstream bug it should likely be closed. It’s also from code 
many years out of date now.