Convert #351986 to Flügger