Convert #226438 to Flügger