Convert #569906 to Flügger