Convert #142861 to Flügger