Convert #734737 to Flügger