Convert #226897 to Flügger