Convert #236741 to Flügger