Convert #226285 to Flügger