Convert #623985 to Flügger