Convert #226287 to Flügger