Convert #226231 to Flügger