Convert #871670 to Flügger