Convert #226871 to Flügger