Convert #334417 to Flügger