Convert #187674 to Flügger