Convert #187686 to Flügger