Convert #389979 to Flügger