I messed up a rebase somwhere this ended up on Volker's name, but it's all me
mentioned in commit adc7a758