This takes over #3476 because that is a good change but lacks the DCO
and the author seems unresponsive.

Reformat the file a bit more while we're at it.

Closes: #3476
Signed-off-by: Miek Gieben <miek@miek.nl>