Convert #236906 to Flügger