Convert #226633 to Flügger