Convert #314077 to Flügger