Convert #417673 to Flügger