Convert #226281 to Flügger