Convert #187482 to Flügger