Convert #614787 to Flügger