Convert #236971 to Flügger