Convert #226981 to Flügger