Convert #623478 to Flügger