Convert #428849 to Flügger