Convert #346271 to Flügger