Convert #129682 to Flügger