Convert #623908 to Flügger