Convert #623679 to Flügger