Convert #623614 to Flügger