Convert #335473 to Flügger