Convert #307482 to Flügger