Convert #409734 to Flügger