Convert #228597 to Flügger