Convert #228581 to Flügger