Convert #226827 to Flügger