Convert #721287 to Flügger