Convert #187441 to Flügger