Convert #103585 to Flügger