Convert #187387 to Flügger