Convert #226386 to Flügger