Convert #228574 to Flügger