Convert #187267 to Flügger