Convert #569338 to Flügger