Convert #226294 to Flügger