Convert #129596 to Flügger