Convert #721934 to Flügger