Convert #346648 to Flügger