Convert #227438 to Flügger