Convert #569684 to Flügger