Convert #148585 to Flügger