Convert #149691 to Flügger