Convert #187677 to Flügger