Convert #461981 to Flügger