Convert #419686 to Flügger