Convert #187179 to Flügger