Convert #226394 to Flügger