Convert #623279 to Flügger