Convert #226261 to Flügger