Convert #187525 to Flügger