Convert #623629 to Flügger