Convert #241585 to Flügger