Convert #228876 to Flügger