Convert #307277 to Flügger