Convert #242887 to Flügger