Convert #142339 to Flügger