Convert #149679 to Flügger