Convert #187670 to Flügger