Convert #236447 to Flügger