Convert #119340 to Flügger