Convert #226387 to Flügger