Convert #623077 to Flügger