Convert #358228 to Flügger