Convert #389574 to Flügger