Convert #227585 to Flügger