Convert #165597 to Flügger