Convert #228379 to Flügger