Convert #228079 to Flügger