Convert #226236 to Flügger