Convert #335589 to Flügger