Convert #226391 to Flügger