Convert #226079 to Flügger