Convert #623278 to Flügger