Convert #227337 to Flügger