Convert #226317 to Flügger