Convert #226821 to Flügger