Convert #569247 to Flügger