Convert #226979 to Flügger