Convert #409570 to Flügger