Convert #236491 to Flügger