Convert #469436 to Flügger