Convert #228326 to Flügger