Convert #226381 to Flügger