Convert #346292 to Flügger