Convert #623549 to Flügger