Convert #347441 to Flügger