@peterbe maybe we should just remove that "-r" ...