Convert #228561 to Flügger