Convert #397287 to Flügger