Convert #353386 to Flügger