Convert #226849 to Flügger