Convert #228578 to Flügger